Douwe Maan
68ac20604b
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
2015-05-05 10:18:27 +02:00
..
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2015-02-22 16:01:49 -07:00
2015-04-24 22:58:27 +02:00
2015-02-12 16:47:06 -08:00
2015-05-05 10:18:27 +02:00
2015-02-18 14:58:20 -08:00
2015-05-02 10:44:52 +02:00
2015-02-12 19:17:35 +01:00
2014-10-15 14:25:06 +02:00
2015-05-02 10:44:52 +02:00
2015-05-02 10:44:52 +02:00
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2014-11-03 14:45:24 +01:00
2015-02-12 19:17:35 +01:00
2015-02-16 11:50:30 -08:00
2015-04-15 19:22:57 +03:00
2015-04-14 12:06:42 +02:00
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2015-02-12 19:17:35 +01:00
2015-04-24 11:22:54 +03:00