Dmitriy Zaporozhets
935fc796d1
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
VERSION
app/controllers/admin/application_settings_controller.rb
app/controllers/omniauth_callbacks_controller.rb
app/controllers/projects/project_members_controller.rb
app/helpers/application_settings_helper.rb
app/models/user.rb
app/services/files/base_service.rb
app/views/profiles/accounts/show.html.haml
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.11.md
doc/workflow/README.md
lib/gitlab/markdown/external_issue_reference_filter.rb
lib/gitlab/reference_extractor.rb
lib/gitlab/upgrader.rb
2015-06-05 11:40:36 +02:00
..
2015-04-30 19:12:15 +02:00
2015-04-30 19:12:15 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-24 12:29:36 +02:00
2015-04-20 15:39:37 +02:00
2015-05-09 22:25:52 +02:00
2015-06-05 11:40:36 +02:00
2015-04-30 19:12:15 +02:00
2015-04-24 12:53:33 +03:00
2015-04-20 15:39:37 +02:00
2015-04-24 12:53:33 +03:00
2015-05-21 23:48:16 -04:00
2015-04-20 15:39:37 +02:00
2015-05-18 13:09:13 +06:00
2015-04-20 15:39:37 +02:00
2015-05-29 00:09:28 -04:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-06-05 11:40:36 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-05-05 10:18:27 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-20 15:39:37 +02:00
2015-04-30 19:12:15 +02:00
2015-04-20 15:39:37 +02:00