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-05-27 14:10:58 -07:00
2015-06-01 23:43:08 +02:00
2015-05-09 22:55:19 +02:00
2015-04-30 21:12:31 +02:00
2015-05-21 11:39:33 +02:00
2015-05-09 22:26:52 +02:00
2015-06-03 18:03:04 -04:00
2015-05-29 11:01:40 +02:00
2015-04-30 19:12:15 +02:00
2015-05-05 10:18:27 +02:00
2015-04-30 19:12:15 +02:00
2015-05-05 10:18:27 +02:00
2015-05-21 23:48:16 -04:00
2015-04-30 19:12:15 +02:00
2015-05-27 14:22:11 +02:00
2015-06-01 22:42:53 -07:00
2015-06-05 11:40:36 +02:00
2015-05-27 14:23:04 +02:00
2015-04-30 21:14:26 +02:00
2015-05-14 12:18:19 +02:00
2015-06-05 11:40:36 +02:00
2015-04-30 19:12:15 +02:00
2015-03-30 19:31:13 +01:00
2015-04-14 17:08:01 +03:00
2015-04-30 19:12:15 +02:00
2015-04-30 21:33:02 +02:00
2015-04-30 21:33:02 +02:00
2015-05-12 10:27:17 +02:00
2015-05-26 19:01:11 +02:00
2015-05-29 18:12:31 +02:00
2015-03-08 22:26:46 -04:00
2015-03-19 17:43:21 -07:00
2013-12-31 16:34:14 +02:00
2015-02-24 15:07:25 +01:00
2015-02-24 15:07:25 +01:00
2015-06-02 13:04:10 -04:00
2015-05-29 15:01:54 +00:00
2015-04-21 22:16:53 +02:00
2015-05-12 10:27:17 +02:00
2015-01-15 10:34:40 -08:00
2015-05-01 10:39:16 +02:00
2015-05-05 13:09:50 +03:00
2015-03-03 11:22:30 +01:00
2015-05-01 10:39:16 +02:00
2015-02-25 19:34:16 -08:00
2015-05-21 11:39:33 +02:00
2015-05-05 19:25:18 +03:00
2015-02-14 11:09:23 -07:00
2015-06-02 20:32:07 -04:00