 Robert Speicher
|
ed2a8ba600
|
Merge 8-2-stable into 8-2-stable-ee
Conflicts remaining:
- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
|
2015-11-19 10:33:18 -05:00 |
|
 Douwe Maan
|
f949245a84
|
Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee
|
2015-07-31 16:12:46 +02:00 |
|
|
Douwe Maan
|
0736f348a6
|
Use before_actions
|
2015-07-31 14:15:49 +02:00 |
|
|
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 |
|
|
Douwe Maan
|
92fd3ccee0
|
Add helpers for header title and sidebar, and move setting those from controllers to layouts.
|
2015-05-01 10:39:16 +02:00 |
|
|
Douwe Maan
|
26ad250989
|
Add a page title to every page.
|
2015-04-30 19:12:15 +02:00 |
|
 Dmitriy Zaporozhets
|
d01d0c02b7
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/deploy_keys_controller.rb
app/controllers/projects/project_members_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_team.rb
app/models/service.rb
app/views/admin/application_settings/_form.html.haml
app/views/admin/groups/show.html.haml
app/views/groups/group_members/_new_group_member.html.haml
config/initializers/1_settings.rb
db/schema.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/reference_extractor_spec.rb
|
2015-04-15 19:22:57 +03:00 |
|
|
Douwe Maan
|
ff3caad4ca
|
Rename manage_group ability to admin_group for consistency with project.
|
2015-04-14 12:05:49 +02:00 |
|
|
Dmitriy Zaporozhets
|
d3361e6d1b
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
Gemfile.lock
app/controllers/admin/application_settings_controller.rb
app/controllers/groups/application_controller.rb
app/controllers/groups/group_members_controller.rb
app/controllers/projects/team_members_controller.rb
app/helpers/application_settings_helper.rb
app/helpers/projects_helper.rb
app/helpers/tab_helper.rb
app/models/application_setting.rb
app/models/user.rb
app/views/devise/shared/_signin_box.html.haml
app/views/groups/projects.html.haml
app/views/profiles/keys/_key.html.haml
app/views/projects/team_members/_form.html.haml
app/views/projects/team_members/index.html.haml
config/routes.rb
db/schema.rb
spec/lib/gitlab/ldap/access_spec.rb
|
2015-03-16 21:25:00 -07:00 |
|
|
Douwe Maan
|
224187ffb9
|
Move group members index from /members to /group_members.
|
2015-03-15 13:51:11 +01:00 |
|
 Valery Sizov
|
d77285999b
|
Web hook: controller refactoring
|
2015-03-12 20:51:38 +02:00 |
|
|
Valery Sizov
|
0b38c3e041
|
group controller refactoring
|
2015-03-12 17:08:48 +02:00 |
|