root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
107,240 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

101 Commits

Author SHA1 Message Date
GitLab Bot 429a0c87c1 Add latest changes from gitlab-org/gitlab@master 2021-10-13 12:12:20 +00:00
GitLab Bot 57a3a42c88 Add latest changes from gitlab-org/gitlab@master 2021-10-12 12:09:36 +00:00
GitLab Bot c753fd0bf4 Add latest changes from gitlab-org/gitlab@master 2021-09-30 18:11:31 +00:00
GitLab Bot 122ed7ce8c Add latest changes from gitlab-org/gitlab@master 2021-08-19 00:11:16 +00:00
GitLab Bot 96acc69fae Add latest changes from gitlab-org/gitlab@master 2021-06-15 12:10:11 +00:00
GitLab Bot f69bc1dab5 Add latest changes from gitlab-org/gitlab@master 2021-06-14 18:10:28 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot ea4de09f48 Add latest changes from gitlab-org/gitlab@master 2021-03-10 21:09:10 +00:00
GitLab Bot 9f5ac379c7 Add latest changes from gitlab-org/gitlab@master 2021-02-11 12:08:52 +00:00
GitLab Bot 6e495b4e91 Add latest changes from gitlab-org/gitlab@master 2021-02-01 09:09:28 +00:00
GitLab Bot b3c8b65ec2 Add latest changes from gitlab-org/gitlab@master 2021-01-06 09:10:31 +00:00
GitLab Bot ed7568cc80 Add latest changes from gitlab-org/gitlab@master 2020-10-16 09:09:06 +00:00
GitLab Bot 2ac4833015 Add latest changes from gitlab-org/gitlab@master 2020-10-08 18:08:32 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 1808454313 Add latest changes from gitlab-org/gitlab@master 2020-01-31 12:08:33 +00:00
GitLab Bot 4eeb6b0d16 Add latest changes from gitlab-org/gitlab@master 2019-12-13 15:08:02 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
gfyoung 12ee2753c1 Enable even more frozen string in app/controllers 
Enables frozen string for some vestigial files as
well as the following:

* app/controllers/projects/**/*.rb
* app/controllers/sherlock/**/*.rb
* app/controllers/snippets/**/*.rb
* app/controllers/users/**/*.rb

Partially addresses #47424.
 2018-09-25 22:43:49 -07:00
Yorick Peterse 2039c8280d
Disable existing offenses for the CodeReuse cops 
This whitelists all existing offenses for the various CodeReuse cops, of
which most are triggered by the CodeReuse/ActiveRecord cop.
 2018-09-11 17:32:00 +02:00
blackst0ne 3d3b46f344 [Rails5] Rename `sort` methods to `sort_by_attribute` 2018-04-04 09:19:47 +00:00
Rémy Coutable 1c88d92b3f Improve Member services 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-02-27 16:02:22 +01:00
Rémy Coutable e82f629be4 Move the #update action from Project/Member controllers to the MembershipActions concern 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-02-27 16:02:22 +01:00
Rémy Coutable bf41063679 Remove explicit audit event log in MembershipActions 
Move it to Members::ApproveAccessRequestService.

Also, note that there was a double audit event log for access request
destruction.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2018-02-27 16:02:22 +01:00
Rémy Coutable 50d7c356c2
Present member collection at the controller level 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-12-12 18:14:58 +01:00
Rubén Dávila 429302b34c Bugfix: User can't change the access level of an access requester 
The endpoint was returning 404 because it was only searching on the
current members of a Group or Project and not the access requesters.
 2017-12-11 09:53:31 -05:00
Tiago Botelho cfd475a45e Removes default scope from sortable 2017-09-07 13:01:59 +01:00
Tim Zallmann 64e589c581 Resolve "Inconsistent location of members page between groups and projects" 2017-07-07 14:40:41 +00:00
Douwe Maan fe13f11041 Create and use project path helpers that only need a project, no namespace 2017-07-05 11:11:59 -05:00
Dmitriy Zaporozhets 395fca1493
Refactor members controller destroy action 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-04-17 17:44:30 +03:00
Dmitriy Zaporozhets 7de75920f7
Refactor controller code that creates project/group members 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2017-04-17 14:45:14 +03:00
Jose Ivan Vargas def6c43da1 Fixed more rspec tests as well as spinach features 2017-01-03 10:52:14 -06:00
Jose Ivan Vargas 68c730bb99 Fixed rspec tests for the project members also fixed the index 
view (removed an extra tag )
 2017-01-03 10:52:14 -06:00
Jose Ivan Vargas 4cd139e948 Moved the members (project_members)option to a single controller called members 
This controller is going to contain both the project members and groups options
for the settings gear.

Generated the route and modified the routing to point to the new members setting path
 2017-01-03 10:52:14 -06:00
Douglas Barbosa Alexandre e644b8d683 Fix query in Projects::ProjectMembersController to fetch members 2016-12-16 20:30:27 -02:00
Nur Rony 09388b2021 Adds sort dropdown for group members 2016-12-16 20:28:33 -02:00
Rémy Coutable d74ad92630
Use a single query in Projects::ProjectMembersController to fetch members 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-12-08 18:35:59 +01:00
Rémy Coutable 96f162125d
Handle an edge-case whith invitees 
When the project has invitees, no group members were
returned due to a `user_id NOT IN (42, NULL)` query which
always returned [] since a `user_id` would be NULL, thus the condition
could never match.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-12-07 09:59:52 +01:00
Phil Hughes cc66ec2b73 Fixed Ruby to be better for performance 
Fixed controls not showing in groups which fixes tests
 2016-12-02 16:50:08 +00:00
Phil Hughes 89c22ed5af Shows group members in the project members list 
Closes #24122
 2016-12-02 16:49:53 +00:00
Valery Sizov 921677782f Implement CreateMembers service to make controller thin 2016-11-01 10:17:04 +02:00
Dmitriy Zaporozhets 7ded7c17d4 Update project member controller to match recent master logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-10-24 13:14:00 +03:00
Dmitriy Zaporozhets f5659ac4d1 Add parentheses around return redirect_to method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-10-24 13:14:00 +03:00
Dmitriy Zaporozhets c82278898d Refactor groups/projects members controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-10-24 13:14:00 +03:00
Linus G Thiel 036fac06d1 Gracefully handle adding of no users to projects and groups 
- Disable {project, group} members submit button if no users

  If no users are selected, the submit button should be disabled.

- Alert user when no users were added to {project, group}.

  When no users were selected for adding, an alert message is
  flashed that no users were added.

- Also, this commit adds a feedback when users were actually added to a
  project, in symmetry with how group members are handled.

Closes #22967, #23270.
 2016-10-24 13:14:00 +03:00
Phil Hughes 50288a6ace Removed code from project members controller 
This code was meant to be added to another branch as an expirement, but instead was commited to wrong branch
 2016-10-20 11:35:29 +01:00
Phil Hughes 6865c46c66 Changed how collections are rendered 
Used variables in haml for replicated checks
Fixed broken conflict
 2016-10-06 15:41:00 +01:00
Phil Hughes 996e802415 Merge branch 'master' into members-ui 2016-10-06 15:30:34 +01:00
Phil Hughes a0eaff1412 Updated Ruby variable name 
Fixed Ruby code based on review feedback
 2016-10-05 14:37:03 +01:00
Phil Hughes c2602aaff3 Updated Ruby 2016-10-04 14:40:03 +01:00
Phil Hughes 2a6942abef Merge branch 'master' into members-ui 2016-10-04 11:03:07 +01:00