Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Repository
366c0065c4302eacbb26ba7292c4c0528dbd33a6
Switch branch/tag
gitlab-ce
app
controllers
omniauth_callbacks_controller.rb
Find file
Blame
History
Permalink
Merge branch 'better_ldap' of
https://github.com/jirutka/gitlabhq
into jirutka-better_ldap
· 366c0065
randx
authored
Aug 21, 2012
Conflicts: app/models/user.rb
366c0065
omniauth_callbacks_controller.rb
789 Bytes
Edit
Web IDE
Replace omniauth_callbacks_controller.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace omniauth_callbacks_controller.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.
