GitBucket
Toggle navigation
Snippets
Sign in
Files
Branches
1
Releases
Issues
2
Pull requests
Labels
Priorities
Milestones
Wiki
Commit Graphs
Kanban
Build
Network
Mirrors
Gantt Chart
Fork
: 0
opidor
/
dmpopidor
Download ZIP
755 commits
Transfer to URL with SHA
tree:
44dbb035e5
Branches
Tags
×
dev
dmpopidor
/
db
/
latest commit
06aa955127
Brian Riley
authored
on 2 Dec 2016
..
migrate
Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.
9 years ago
schema.rb
Had to remove code that was building devise omniauth connections dynamically. The timing of when the rails engine builds the routes and the models is not conducive to this approach
9 years ago
seeds.rb
Resolved merge conflicts with fr.yml locale file and the user.rb model. Kept 'language_id' in the attr_accessible list and kept both the self.from_omniauth and reset_password_link methods.
9 years ago