 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
|
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
|
31fc73f0a9
|
Use project_member instead of team_member.
|
2015-03-15 13:50:38 +01:00 |
|
|
Dmitriy Zaporozhets
|
30ca451fd4
|
Refactor buttons
|
2015-03-14 00:29:32 -07:00 |
|
|
Dmitriy Zaporozhets
|
be4d340381
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Conflicts:
Gemfile.lock
app/controllers/uploads_controller.rb
app/models/application_setting.rb
app/models/project_services/issue_tracker_service.rb
app/views/projects/services/_form.html.haml
db/schema.rb
doc/integration/README.md
features/steps/groups.rb
|
2015-03-11 18:41:41 -07:00 |
|
|
Dmitriy Zaporozhets
|
be3edeb6a1
|
Small UI improvements after css refactoring
|
2015-03-07 10:35:17 -08:00 |
|
 Vinnie Okada
|
067a5b9d8b
|
Update path helpers and routes for Rails 4.1.9
Update project path helpers and routes to reflect the new nested
resources introduced in the Rails 4.1.9 upgrade.
|
2015-02-27 18:21:15 -07:00 |
|
|
Vinnie Okada
|
76aad9b76e
|
Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
|
2015-02-14 11:09:23 -07:00 |
|
|
Dmitriy Zaporozhets
|
f3f27fee88
|
Left-side navigation for group layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-12-16 16:58:15 +02:00 |
|
 Sullivan SENECHAL
|
5d8be4438a
|
Upgrade to Font Awesome v4.2
|
2014-10-03 12:19:24 +02:00 |
|
|
Dmitriy Zaporozhets
|
5b26b45dcb
|
Improve group settings UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-05-29 21:30:20 +03:00 |
|