Dmitriy Zaporozhets
f4d43ed3b1
Merge branch 'master' into ce-upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/services_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/user.rb
app/views/admin/users/index.html.haml
app/views/projects/services/_form.html.haml
config/gitlab.yml.example
config/initializers/1_settings.rb
lib/gitlab/git_access.rb
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/person.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/ldap/access_spec.rb
2014-10-14 18:23:51 +03:00
..
2014-06-27 11:29:18 +02:00
2014-08-20 14:25:55 +02:00
2014-06-03 23:16:31 +02:00
2014-09-29 13:38:43 +02:00
2014-09-28 15:47:53 +02:00
2014-09-28 13:59:33 +02:00
2014-09-29 16:10:32 +02:00
2014-09-28 15:47:53 +02:00
2014-09-29 16:13:02 +02:00
2014-09-28 13:59:33 +02:00
2014-10-14 13:21:42 +02:00
2014-10-01 15:30:29 +02:00
2014-09-28 15:47:53 +02:00
2014-08-07 10:27:54 +02:00
2014-08-20 16:24:17 +02:00
2014-09-28 15:47:53 +02:00
2014-09-28 15:47:53 +02:00
2014-09-29 16:10:32 +02:00
2014-09-28 15:47:53 +02:00
2014-09-28 13:59:33 +02:00
2014-08-07 10:27:54 +02:00
2014-10-02 13:24:59 +03:00
2014-09-28 15:47:53 +02:00
2014-09-28 13:59:33 +02:00
2014-09-28 15:47:53 +02:00
2014-06-27 11:29:18 +02:00
2014-09-28 15:47:53 +02:00
2014-06-03 23:16:31 +02:00
