 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
|
a3bd323cd3
|
Remove an old determine_layout call.
|
2015-04-30 20:02:00 +02:00 |
|
 Dmitriy Zaporozhets
|
f502b293e5
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
db/schema.rb
spec/helpers/gitlab_markdown_helper_spec.rb
|
2015-04-24 11:22:54 +03:00 |
|
 Jeroen van Baarsen
|
5a4ebfb47a
|
Fixed the Rails/ActionFilter cop
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
|
2015-04-20 15:39:37 +02:00 |
|
|
Dmitriy Zaporozhets
|
135372849d
|
Fix conflict
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-04-15 20:22:23 +03: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
|
cb5362e7ce
|
Follow newline guidelines.
|
2015-04-14 15:16:00 +02:00 |
|
|
Douwe Maan
|
1b5c483d89
|
Consistently use "invitation" rather than "invite" in text.
|
2015-04-14 12:25:16 +02:00 |
|
|
Douwe Maan
|
2a45eb6a91
|
Use notice flash type rather than nonexistent info.
|
2015-04-14 12:08:11 +02:00 |
|
|
Douwe Maan
|
453340d449
|
Let membership invitations be resent.
|
2015-04-14 12:08:10 +02:00 |
|
|
Douwe Maan
|
90dafe31c4
|
Only show invited users to people who can admin group.
|
2015-04-14 12:07:33 +02:00 |
|
|
Douwe Maan
|
2b2bd402dc
|
Track who created a group or project member.
|
2015-04-14 12:06:42 +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
|
84371de01f
|
Move group leave action from dashboard/groups to groups/group_members.
|
2015-03-15 13:52:28 +01:00 |
|
|
Douwe Maan
|
224187ffb9
|
Move group members index from /members to /group_members.
|
2015-03-15 13:51:11 +01:00 |
|
|
Douwe Maan
|
99f995755e
|
Use group_member instead of users_group or membership.
|
2015-03-15 13:49:41 +01:00 |
|
 Valery Sizov
|
d77285999b
|
Web hook: controller refactoring
|
2015-03-12 20:51:38 +02:00 |
|
|
Valery Sizov
|
e3df22f224
|
Merge remote-tracking branch 'dev/master' into ce_upstream1
|
2015-03-12 18:39:24 +02:00 |
|
|
Valery Sizov
|
0b38c3e041
|
group controller refactoring
|
2015-03-12 17:08:48 +02:00 |
|
 Marin Jankovski
|
6bcb1a033f
|
Add removal and addition of the user to the group membership to audit events.
|
2014-11-21 16:51:06 +01:00 |
|
|
Marin Jankovski
|
b68e1123fb
|
Move event creation to service.
|
2014-11-21 12:32:12 +01:00 |
|
|
Marin Jankovski
|
e348c6512f
|
Add group audit events.
|
2014-11-20 08:54:49 +01:00 |
|
|
Dmitriy Zaporozhets
|
644fd232db
|
Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-20 16:37:52 +03:00 |
|
|
Dmitriy Zaporozhets
|
2064a14724
|
Add tests for remove group member feature in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-10-20 13:18:07 +03:00 |
|
|
Dmitriy Zaporozhets
|
1aa48174db
|
Fix STI+polymorphic for Group <-> GroupMember
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2014-09-14 21:52:54 +03:00 |
|