Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

H

Habit Tracker Web App
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

31903777

Commit 31903777 authored 4 years ago by Butler, Alexis (UG - Computer Science)

Downloads
- Plain Diff

Merge branch '27-google-integration' into 'Development'

Resolve "Google Integration"

See merge request group-10/habit-tracker-web-app!59

parents 440103d4 7373b790

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 10
Pipelines 3

Hide whitespace changes

Inline Side-by-side

Showing

.idea/Group10HabitTracker.iml 9 additions, 1 deletion

.idea/Group10HabitTracker.iml
Gemfile 1 addition, 0 deletions

Gemfile
Gemfile.lock 10 additions, 0 deletions

Gemfile.lock
app/controllers/omniauth_callbacks_controller.rb 11 additions, 0 deletions

app/controllers/omniauth_callbacks_controller.rb
app/controllers/schedules_controller.rb 9 additions, 0 deletions

app/controllers/schedules_controller.rb
app/models/user.rb 3 additions, 1 deletion

app/models/user.rb
app/views/devise/sessions/new.html.erb 5 additions, 0 deletions

app/views/devise/sessions/new.html.erb
app/views/home/home.html.erb 32 additions, 0 deletions

app/views/home/home.html.erb
config/locales/devise.en.yml 1 addition, 0 deletions

config/locales/devise.en.yml
config/locales/en.yml 2 additions, 1 deletion

config/locales/en.yml

with 83 additions and 3 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment