Commit Graph

270 Commits

Author SHA1 Message Date
GitLab Bot 3df6bfc24c Add latest changes from gitlab-org/gitlab@master 2021-04-12 15:09:30 +00:00
GitLab Bot 7484851b5f Add latest changes from gitlab-org/gitlab@master 2021-04-09 09:09:10 +00:00
GitLab Bot 3bd9ad5574 Add latest changes from gitlab-org/gitlab@master 2021-03-25 03:09:35 +00:00
GitLab Bot 889bf7a0ee Add latest changes from gitlab-org/gitlab@master 2021-03-16 18:11:53 +00:00
GitLab Bot 5231344d99 Add latest changes from gitlab-org/gitlab@master 2021-02-11 15:09:11 +00:00
GitLab Bot 89f3fa0b96 Add latest changes from gitlab-org/gitlab@master 2021-02-04 00:09:18 +00:00
GitLab Bot ea037b9157 Add latest changes from gitlab-org/gitlab@master 2021-01-21 09:08:52 +00:00
GitLab Bot 2eaa60e455 Add latest changes from gitlab-org/gitlab@master 2020-11-26 15:09:30 +00:00
GitLab Bot 554826c701 Add latest changes from gitlab-org/gitlab@master 2020-11-12 03:09:17 +00:00
GitLab Bot ce27ba9f6c Add latest changes from gitlab-org/gitlab@master 2020-10-29 18:09:11 +00:00
GitLab Bot 6a0085290e Add latest changes from gitlab-org/gitlab@master 2020-10-15 00:08:42 +00:00
GitLab Bot 9689350c65 Add latest changes from gitlab-org/gitlab@master 2020-09-14 21:09:27 +00:00
GitLab Bot c787c1559e Add latest changes from gitlab-org/gitlab@master 2020-08-13 18:10:36 +00:00
GitLab Bot 36b0a5b875 Add latest changes from gitlab-org/gitlab@master 2020-07-21 18:09:45 +00:00
GitLab Bot ccefff8087 Add latest changes from gitlab-org/gitlab@master 2020-07-18 00:09:34 +00:00
GitLab Bot 651917dbac Add latest changes from gitlab-org/gitlab@master 2020-07-15 21:09:26 +00:00
GitLab Bot c7b780b56d Add latest changes from gitlab-org/gitlab@master 2020-07-10 21:09:29 +00:00
GitLab Bot ff1701e51d Add latest changes from gitlab-org/gitlab@master 2020-07-10 06:09:23 +00:00
GitLab Bot 1c75400c24 Add latest changes from gitlab-org/gitlab@master 2020-07-03 09:08:53 +00:00
GitLab Bot 777f6da99a Add latest changes from gitlab-org/gitlab@master 2020-06-29 21:09:07 +00:00
GitLab Bot d48cbe1786 Add latest changes from gitlab-org/gitlab@master 2020-06-08 21:09:17 +00:00
GitLab Bot ead1d2523c Add latest changes from gitlab-org/gitlab@master 2020-06-04 15:08:21 +00:00
GitLab Bot 4d5ee2b814 Add latest changes from gitlab-org/gitlab@master 2020-05-27 15:08:11 +00:00
GitLab Bot 927df95cc4 Add latest changes from gitlab-org/gitlab@master 2020-05-15 12:08:28 +00:00
GitLab Bot 0e1a6f6a2b Add latest changes from gitlab-org/gitlab@master 2020-05-12 09:09:31 +00:00
GitLab Bot 2e4d8b3449 Add latest changes from gitlab-org/gitlab@master 2020-04-28 03:09:53 +00:00
GitLab Bot f569792df8 Add latest changes from gitlab-org/gitlab@master 2020-04-27 18:09:41 +00:00
GitLab Bot e33f87ac0f Add latest changes from gitlab-org/gitlab@master 2020-04-21 15:21:10 +00:00
GitLab Bot 074d013e1e Add latest changes from gitlab-org/gitlab@master 2020-03-23 15:09:36 +00:00
GitLab Bot b042382bbf Add latest changes from gitlab-org/gitlab@master 2020-02-05 18:09:06 +00:00
GitLab Bot 536aa3a1f4 Add latest changes from gitlab-org/gitlab@master 2020-01-30 15:09:15 +00:00
GitLab Bot 23288f62da Add latest changes from gitlab-org/gitlab@master 2020-01-29 15:08:59 +00:00
GitLab Bot 727b1a890c Add latest changes from gitlab-org/gitlab@master 2020-01-16 21:08:24 +00:00
GitLab Bot 74a89b1221 Add latest changes from gitlab-org/gitlab@master 2020-01-13 21:07:39 +00:00
GitLab Bot f32a580aa1 Add latest changes from gitlab-org/gitlab@master 2020-01-13 18:08:05 +00:00
GitLab Bot b0bfadd486 Add latest changes from gitlab-org/gitlab@master 2019-12-30 12:09:15 +00:00
GitLab Bot fb73ca3398 Add latest changes from gitlab-org/gitlab@master 2019-12-27 15:08:16 +00:00
GitLab Bot 34b3567c97 Add latest changes from gitlab-org/gitlab@master 2019-11-19 09:06:16 +00:00
GitLab Bot 6e81d7f628 Add latest changes from gitlab-org/gitlab@master 2019-11-15 15:06:12 +00:00
GitLab Bot ae72d71da8 Add latest changes from gitlab-org/gitlab@master 2019-11-08 21:06:38 +00:00
GitLab Bot 8dfb94309c Add latest changes from gitlab-org/gitlab@master 2019-10-22 00:06:05 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
GitLab Bot b7dfe2ae40 Add latest changes from gitlab-org/gitlab@master 2019-09-13 13:26:31 +00:00
Filipa Lacerda 48b98b5898 Enables Run Pipeline button to be rendered
In the Merge Request view, under pipelines tab
the user can see a run pipeline button

Adds axios post request to button click

Adds the logic to handle the user click,
refresh the table and disable the button while thee
request is being made

Updates UI for desktop and mobile

Adds specs
Regenerates potfile

Follow-up after review

Uses .finally to avoid code repetition
2019-09-11 09:06:33 +00:00
Nick Thomas 381468d0cc
Allow asynchronous rebase operations to be monitored
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.

After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
2019-07-04 08:50:55 +01:00
Marin Jankovski f66169b35c Merge branch 'security-59581-related-merge-requests-count' into 'master'
Expose merge requests count based on user access

See merge request gitlab/gitlabhq!3157
2019-07-02 06:19:58 +00:00
Oswaldo Ferreira 3af348b6cf Automatically update MR merge-ref along merge status
This couples the code that transitions the `MergeRequest#merge_status`
and refs/merge-requests/:iid/merge ref update.

In general, instead of directly telling `MergeToRefService` to update
the merge ref, we should rely on `MergeabilityCheckService` to keep
both the merge status and merge ref synced. Now, if the merge_status is
`can_be_merged` it means the merge-ref is also updated to the latest.

We've also updated the logic to be more systematic and less user-based.
2019-06-20 11:48:30 -03:00
Alexandru Croitor 09163e423a Expose merge requests count based on user access
Count issues related merge requests based on user access level. And
issue can have related MRs from projects where user does not have
access so the number of related merge requests should be adjusted
based on user's ability to access the related MRs.

https://gitlab.com/gitlab-org/gitlab-ce/issues/59581
2019-06-18 12:46:46 +03:00
Oswaldo Ferreira 00a273d3a9 Revert "Automatically update MR merge-ref along merge status" 2019-06-11 13:08:25 -03:00
Douwe Maan 96ff9c6bd8 Merge branch 'osw-sync-merge-ref-upon-mergeability-check' into 'master'
Automatically update MR merge-ref along merge status

Closes #58495

See merge request gitlab-org/gitlab-ce!28513
2019-06-03 16:29:41 +00:00