c5e4f06c59
Add latest changes from gitlab-org/gitlab@master
2021-04-29 15:10:07 +00:00
874d5e8019
Add latest changes from gitlab-org/gitlab@master
2021-01-27 18:09:08 +00:00
eb489ab3e7
Add latest changes from gitlab-org/gitlab@master
2021-01-12 21:10:47 +00:00
4fed8ce9c8
Add latest changes from gitlab-org/gitlab@master
2020-12-22 06:10:02 +00:00
71c85847eb
Add latest changes from gitlab-org/gitlab@master
2020-11-19 18:09:13 +00:00
cfaf98a3b2
Add latest changes from gitlab-org/gitlab@master
2020-11-18 03:09:21 +00:00
feb61d56e7
Add latest changes from gitlab-org/gitlab@master
2020-11-13 18:09:11 +00:00
534eb932e0
Add latest changes from gitlab-org/gitlab@master
2020-11-11 03:08:57 +00:00
2b1e7f7dac
Add latest changes from gitlab-org/gitlab@master
2020-10-27 15:08:39 +00:00
b17f0b91a6
Add latest changes from gitlab-org/gitlab@master
2020-10-12 15:08:32 +00:00
6aa5c04c74
Add latest changes from gitlab-org/gitlab@master
2020-09-30 12:09:53 +00:00
766b24b86b
Add latest changes from gitlab-org/gitlab@master
2020-09-10 12:08:54 +00:00
692f4b734f
Add latest changes from gitlab-org/gitlab@master
2020-09-03 21:08:18 +00:00
c41b66bd05
Add latest changes from gitlab-org/gitlab@master
2020-08-28 15:10:21 +00:00
4203215d54
Add latest changes from gitlab-org/gitlab@master
2020-08-17 12:10:12 +00:00
ed16c9434e
Add latest changes from gitlab-org/gitlab@master
2020-06-18 18:08:58 +00:00
4c788f43cb
Add latest changes from gitlab-org/gitlab@master
2020-05-28 09:08:05 +00:00
e3190840bc
Add latest changes from gitlab-org/gitlab@master
2020-05-11 12:10:28 +00:00
f50b93c373
Add latest changes from gitlab-org/gitlab@master
2020-03-27 21:07:53 +00:00
ef31adeb0f
Add latest changes from gitlab-org/gitlab@master
2020-03-26 12:07:48 +00:00
074d013e1e
Add latest changes from gitlab-org/gitlab@master
2020-03-23 15:09:36 +00:00
72721699f1
Add latest changes from gitlab-org/gitlab@master
2020-02-18 00:09:20 +00:00
e144369009
Add latest changes from gitlab-org/gitlab@master
2020-02-14 00:09:07 +00:00
23288f62da
Add latest changes from gitlab-org/gitlab@master
2020-01-29 15:08:59 +00:00
bbe2430603
Add latest changes from gitlab-org/gitlab@master
2019-12-18 18:08:04 +00:00
4eea104c69
Add latest changes from gitlab-org/gitlab@master
2019-12-11 15:07:38 +00:00
2349eabc1a
Add latest changes from gitlab-org/gitlab@master
2019-12-06 00:07:48 +00:00
991a295378
Add latest changes from gitlab-org/gitlab@master
2019-11-11 00:06:26 +00:00
8e45d25f7d
Add latest changes from gitlab-org/gitlab@master
2019-10-16 18:08:01 +00:00
69849c280c
Add latest changes from gitlab-org/gitlab@master
2019-10-10 12:06:19 +00:00
308146dc39
Add latest changes from gitlab-org/gitlab@master
2019-10-10 00:06:44 +00:00
4b28d5ae77
Add latest changes from gitlab-org/gitlab@master
2019-10-09 21:06:24 +00:00
b7dfe2ae40
Add latest changes from gitlab-org/gitlab@master
2019-09-13 13:26:31 +00:00
3288e1a874
Adds the Rubocop ReturnNil cop
...
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
2019-03-06 17:51:56 +02:00
45ce5ff7ea
Fix Projects::MergeRequests::DiffsController specs
...
These specs were flaky and only passing after a retry due to how
rspec-retry works.
1. The test with paths that don't exist was returning 200 on the first
try, then 404 on the second, not because the paths don't exist, but
because the MR IID didn't change, thus the MR couldn't be found.
I decided to remove the test entirely since we don't seem to return
404 for paths that don't exist.
2. The test with a user that cannot view the merge request was failing
the first time because the project owner wasn't removed with
`project.team.truncate`.
Changing the `let(:user)` to `create(:user)` and calling
`project.add_maintainer(user)` in the `before` block fix the test.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-02-18 12:13:08 +01:00
89a676019c
Avoid 500's when serializing legacy diff notes
2018-12-04 13:13:22 -02:00
f9b4130bb7
Comment on any expanded diff line on MRs
2018-11-09 16:56:48 -02:00
198402b38b
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
...
This reverts commit a82a595728e7df959b8f
2018-11-07 19:57:26 -02:00
ec66ef1b74
Comment on any expanded diff line on MRs
2018-11-06 17:39:31 -02:00
5a286eb7a3
Add signature badge to diffs/commit_item
...
**Notes:**
- Also exposes commit.signature_html in diffs.json
2018-10-03 13:18:20 -05:00
4962bee87a
Merge branch 'frozen-string-app-controllers-much-more' into 'master'
...
Enable even more frozen string in app/controllers
See merge request gitlab-org/gitlab-ce!21919
2018-09-26 10:50:16 +00:00
f390184249
Resolve "Commit details are not displayed when reviewing an MR commit by commit"
2018-09-26 08:28:50 +00:00
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
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
cd1d5b2440
Cache diff highlighting upon Merge Request creation (refactors diff caching)
2018-09-07 10:07:18 -03:00
3e66795ef1
Changes tab VUE refactoring
2018-06-21 12:22:40 +00:00
cb6f51ec9b
add support for the commit reference filter
2017-12-07 09:01:37 -05:00
6b3f0fee15
corrects the url building
2017-12-07 09:01:23 -05:00
142edf0afc
diff notes created in merge request on a commit have the right context
...
add a spec for commit merge request diff notes
2017-12-07 09:01:23 -05:00
e4eba908cd
Allow commenting on individual commits inside an MR
2017-12-07 09:01:19 -05:00
GitLab Bot
Andrew Newdigate
Rémy Coutable
Oswaldo Ferreira
Paul Slaughter
gfyoung
Yorick Peterse
Felipe Artur
micael.bergeron
Douwe Maan