kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
109,265 Commits 1 Branch 0 Tags 899 MiB
Commit Graph

11 Commits

Author SHA1 Message Date
GitLab Bot 046d6f5277 Add latest changes from gitlab-org/gitlab@master 2021-10-11 15:13:01 +00:00
GitLab Bot 79f759cc14 Add latest changes from gitlab-org/gitlab@master 2021-09-21 18:11:18 +00:00
GitLab Bot a5628d3b6d Add latest changes from gitlab-org/gitlab@master 2021-06-09 06:10:29 +00:00
GitLab Bot c80a1141e3 Add latest changes from gitlab-org/gitlab@master 2021-06-04 12:10:17 +00:00
GitLab Bot 0ae8428c8e Add latest changes from gitlab-org/gitlab@master 2021-05-11 21:10:21 +00:00
GitLab Bot a071c2888d Add latest changes from gitlab-org/gitlab@master 2020-09-23 12:09:58 +00:00
gfyoung e166e5747c Enable some frozen string in lib/gitlab 
Enable frozen string for the following files:

* lib/gitlab/auth/**/*.rb
* lib/gitlab/badge/**/*.rb
* lib/gitlab/bare_repository_import/**/*.rb
* lib/gitlab/bitbucket_import/**/*.rb
* lib/gitlab/bitbucket_server_import/**/*.rb
* lib/gitlab/cache/**/*.rb
* lib/gitlab/checks/**/*.rb

Partially addresses #47424.
 2018-10-13 02:31:31 -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
Rémy Coutable 2cf7f09b1e
Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' "" 
This reverts commit 530f5158e2.

See !4892.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-07-18 10:16:56 +02:00
Robert Speicher 530f5158e2 Revert "Merge branch '18193-developers-can-merge' into 'master' " 
This reverts commit 9ca633eb4c, reversing
changes made to fb229bbf79.
 2016-07-13 13:57:30 -05:00
Timothy Andrew 495db09653 Enforce "developers can merge" during `pre-receive`. 
1. When a merge request is being merged, save the merge commit SHA in
   the `in_progress_merge_commit_sha` database column.

2. The `pre-receive` hook looks for any locked (in progress) merge
   request with `in_progress_merge_commit_sha` matching the `newrev` it
   is passed.

3. If it finds a matching MR, the merge is legitimate.

4. Update `git_access_spec` to test the behaviour we added here. Also
   refactored this spec a bit to make it easier to add more contexts / conditions.
 2016-07-13 13:24:56 +05:30