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
nexedi
gitlab-ce
Repository
f59b692420ed631ffa0b2416509a63e594dedc76
Switch branch/tag
gitlab-ce
db
schema.rb
Find file
Blame
History
Permalink
Merge branch 'feature-multi-ldap-servers-merge-master' into feature-multi-ldap-servers-group-sync
· 9b678226
Jan-Willem van der Meer
authored
Oct 15, 2014
Conflicts: db/schema.rb lib/api/ldap.rb
9b678226
schema.rb
18.7 KB
Edit
Web IDE
Replace schema.rb
×
Attach a file by drag & drop or
click to upload
local_assigns[:label_text] || Commit message
Replace schema.rb
Replace file
Cancel
A new branch will be created in your fork and a new merge request will be started.