5f5f492fe2
Add latest changes from gitlab-org/gitlab@master
2021-04-22 15:09:56 +00:00
b81fd57f3d
Add latest changes from gitlab-org/gitlab@master
2021-04-22 09:09:45 +00:00
98f1353fcd
Add latest changes from gitlab-org/gitlab@master
2021-04-20 21:09:07 +00:00
8bcfcd53f3
Add latest changes from gitlab-org/gitlab@master
2021-04-20 15:09:24 +00:00
72179bac11
Add latest changes from gitlab-org/gitlab@master
2021-04-16 00:09:09 +00:00
74804f8c31
Add latest changes from gitlab-org/gitlab@master
2021-04-15 18:09:01 +00:00
beab869416
Add latest changes from gitlab-org/gitlab@master
2021-04-12 21:11:12 +00:00
dc7cd84a3e
Add latest changes from gitlab-org/gitlab@master
2021-04-07 09:09:06 +00:00
5facc34f44
Add latest changes from gitlab-org/gitlab@master
2021-03-31 15:10:27 +00:00
e8c01bc6a1
Add latest changes from gitlab-org/gitlab@master
2021-03-15 21:09:16 +00:00
a0213db466
Add latest changes from gitlab-org/gitlab@master
2021-03-15 18:09:05 +00:00
6f2b1c32f3
Add latest changes from gitlab-org/gitlab@master
2021-03-09 15:08:59 +00:00
57f6fa3cd7
Add latest changes from gitlab-org/gitlab@master
2021-02-22 18:10:55 +00:00
b6e10aaed7
Add latest changes from gitlab-org/gitlab@master
2021-02-10 09:09:38 +00:00
f4726e9f50
Add latest changes from gitlab-org/gitlab@master
2021-02-04 21:09:06 +00:00
2ac4833015
Add latest changes from gitlab-org/gitlab@master
2020-10-08 18:08:32 +00:00
999f47e9e6
Add latest changes from gitlab-org/gitlab@master
2020-08-12 12:10:25 +00:00
f6e985dba4
Add latest changes from gitlab-org/gitlab@master
2020-01-08 06:08:13 +00:00
bbe2430603
Add latest changes from gitlab-org/gitlab@master
2019-12-18 18:08:04 +00:00
eca3cd3a9e
Add latest changes from gitlab-org/gitlab@master
2019-11-15 18:06:24 +00:00
6683298fe6
Merge branch 'security-commit-private-related-mr' into 'master'
...
Don't allow non-members to see private related MRs
Closes #2787
See merge request gitlab/gitlabhq!2866
2019-03-04 18:37:10 +00:00
65723a2cb6
Modify MergeRequestsFinder to allow filtering by commit
2019-01-28 15:11:38 +08:00
3a2abc1d50
Enable the Layout/ExtraSpacing cop
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24 13:05:45 +01:00
87444fb6ed
Adds pagination to pipelines table in merge request page
2018-10-31 17:10:36 +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
cab5039c91
Fix branch name in case of new merge request cherry pick
2018-08-19 23:28:54 +03:00
70830c2300
Add target branch to cherry pick confirmation message
2018-08-19 23:11:49 +03:00
f1d3ea63cf
Show the status of a user in interactions
...
The status is shown for
- The author of a commit when viewing a commit
- Notes on a commit (regular/diff)
- The user that triggered a pipeline when viewing a pipeline
- The author of a merge request when viewing a merge request
- The author of notes on a merge request (regular/diff)
- The author of an issue when viewing an issue
- The author of notes on an issue
- The author of a snippet when viewing a snippet
- The author of notes on a snippet
- A user's profile page
- The list of members of a group/user
2018-07-30 15:01:26 +02:00
dfdd881510
Workhorse to send raw diff and patch for commits
...
Prior to this change, this was done through unicorn. In theory this
could time out. Workhorse has been sending these raw patches and diffs
for a long time and is stable in doing so.
Added bonus is the fact that `Commit#to_patch` can be removed.
`Commit#to_diff` too, which closes
https://gitlab.com/gitlab-org/gitaly/issues/324
Closes https://gitlab.com/gitlab-org/gitaly/issues/1196
2018-05-16 11:52:43 +02:00
28bae3b6bc
Resolve "tree/master shows incorrect CI build status"
2018-04-11 13:54:55 +00:00
a7d26f00c3
Display related merge requests in commit detail page
2018-01-12 20:38:36 +00:00
e4eba908cd
Allow commenting on individual commits inside an MR
2017-12-07 09:01:19 -05:00
f9565e3039
Batchload blobs for diff generation
...
After installing a new gem, batch-loader, a construct can be used to
queue data to be fetched in bulk. The gem was also introduced in both
gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846 , but those mrs
are not merged yet.
For the generation of diffs, both the old blob and the new blob need to
be loaded. This for every file in the diff, too. Now we collect all
these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed,
which I expect to be valid, but this needs to be confirmed by a full CI
run.
Possibly closes:
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37445
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37599
- https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
2017-11-21 13:53:26 +01:00
cbdf372eb8
implemented using an ivar, and added specs
2017-10-13 19:11:11 +02:00
528f9cde05
moved throttling into the controller. if we hit the throttling
...
threshhold, a message is shown indicating we didn't perform the search
2017-10-12 15:31:43 +02:00
6d3eea7b46
if the branch/tag count is over a certain limit, don't execute
...
the long running git query
2017-10-11 14:15:28 +02:00
64d7ec0a9e
Detect n+1 issues involving Gitaly
2017-09-19 10:55:37 +00:00
966b1128d8
WIP: refactor the first-contributor to Issuable
...
this will remove the need make N queries (per-note) at the
cost of having to mark notes with an attribute
this opens up the possibility for other special roles for notes
2017-09-06 09:00:57 -04:00
706d99aed8
Update Pipeline's badge count in Merge Request and Commits view to match real-time content
2017-07-14 15:52:54 +00:00
fe13f11041
Create and use project path helpers that only need a project, no namespace
2017-07-05 11:11:59 -05:00
0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
d170133bde
Refactor changing files in web UI
2017-04-20 00:37:44 +00:00
2f22890d42
Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussion
2017-04-07 12:09:20 +01:00
9e89c93e16
Enable polling for pipelines table other pages
...
Also poll for pipeline changes on:
- Pipeline table on commit page
- Pipeline table on merge request page
- Pipeline table on new merge request page
2017-04-06 23:50:37 +02:00
21e10888c3
Address review comments
2017-04-05 17:44:14 +01:00
fe26b8af94
Correctly display multiple separate discussions on the same diff line
2017-04-05 17:44:14 +01:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
6cc4cf1e15
Fix cherry-picking or reverting through an MR
2017-03-02 17:41:05 -06:00
58eae0961e
Merge branch 'route-map' into 'master'
...
Add 'View on [env]' link to blobs and individual files in diffs
See merge request !8867
2017-02-07 19:14:19 +00:00
GitLab Bot
Yorick Peterse
Patrick Bajao
Rémy Coutable
Filipa Lacerda
gfyoung
George Andrinopoulos
Bob Van Landuyt
Zeger-Jan van de Weg
Lin Jen-Shin
Hiroyuki Sato
Douwe Maan
Brett Walker
Andrew Newdigate
micael.bergeron
Fatih Acet
Douwe Maan
Luke "Jared" Bennett
Toon Claes
Robert Speicher