 Dmitriy Zaporozhets
|
f840903112
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/helpers/tab_helper.rb
app/models/merge_request.rb
app/views/layouts/nav/_project_settings.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
doc/api/groups.md
|
2015-06-12 11:16:28 +02:00 |
|
 Nicolas
|
ebe4963871
|
Move Project Members link from Settings to main menu.
Addresses #2278.
|
2015-06-09 14:45:38 +02:00 |
|
|
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 |
|
|
Dmitriy Zaporozhets
|
2afa5fcb52
|
Add ability to leave project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-05-29 16:23:36 +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
|
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
|
0013ea5130
|
Remove duplication between Group and ProjectMember.
|
2015-04-14 12:41:19 +02:00 |
|
|
Douwe Maan
|
1b5c483d89
|
Consistently use "invitation" rather than "invite" in text.
|
2015-04-14 12:25:16 +02:00 |
|
|
Douwe Maan
|
453340d449
|
Let membership invitations be resent.
|
2015-04-14 12:08:10 +02:00 |
|
|
Douwe Maan
|
87dd3f215f
|
Let members be invited from Add members pane.
|
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
|
cee98f2247
|
Reference project members by id instead of user_id.
|
2015-04-14 12:06:43 +02:00 |
|
|
Douwe Maan
|
2b2bd402dc
|
Track who created a group or project member.
|
2015-04-14 12:06:42 +02:00 |
|
|
Dmitriy Zaporozhets
|
11c28f33a8
|
Fix project memeber management
|
2015-03-17 09:22:41 -07:00 |
|
|
Dmitriy Zaporozhets
|
7647bc0eb8
|
Fix adding project member
|
2015-03-16 23:38:24 -07:00 |
|
|
Dmitriy Zaporozhets
|
4ca96a5c26
|
Return membership lock feature for groups
|
2015-03-16 22:28:57 -07: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 |
|