Fix bug where manually merged branches in a MR would end up with an empty diff
This bug manifested in 8.1 with the refactoring of `RefreshService`. Here's what happens:
1. User create a new branch `foo`.
2. User creates a merge request for `foo`.
3. User merges `foo` into `master` by hand.
4. `RefreshService` reloads the merge request. Since `master` is equivalent to `foo`, this results in an empty diff.
5. `RefreshService` then closes the MR.
This wasn't an issue when you use the normal "Accept Merge Request" flow because the act of clicking the button closes the merge request, so step 4 never happens.
Closes#3314
See merge request !1758
Enable shared runners for all new projects
This adds Admin Setting option to enable shared runners for all new projects, and by default it is set to true.
/cc @dzaporozhets @sytses
See merge request !1738
Add some polish to CI integration
Check the list of commits to see what I changed.
cc @dzaporozhets
@rspeicher I'd love to get this into 8.1, since it's mostly refactoring/tweaking of stuff that was _introduced_ in 8.1.
Fixes#2645.
See merge request !1641
- Add page titles to CI settings.
- Fix CI admin navigation.
- Remove duplicated scope.
- Use monospace font for commit sha.
- Add page title and header title to build page.
- Proper authorization for cancel/retry builds.
- Use gitlab pagination theme for builds and group members.
- Don't paginate builds widget on build page.
- Add badges to commit page Changes/Builds tabs.
- Add "Builds" to commit Builds tab page title.
- Add and use Ci::Build#retryable? method.
- Add CI::Build#retried? method.
- Allow all failed commit builds to be retried.
- Proper authorization for cancel/retry all builds.
- Remove unused param.
- Use time_ago_with_tooltip where appropriate.
- Tweak builds index text
- Remove duplication between builds/build and commit_statuses/commit_status.
- Use POST rather than GET for canceling and retrying builds.
- Remove redundant URL helpers.
- Add build ID to build page.
- Link branch name on build page.
- Move commit/:sha/ci to commit/:sha/builds.
Otherwise text will flow under the "timeago" element.
The original value was 80px (see commit 8b0906c8), but a value of 174px
makes more sense. (see event-title `calc` function).
Prevent the second, third, ... rows from having a different indentation
than the first commit row.
Adding the extra "15px padding" to the event item prevents this.
Having a 15px margin on the avatar only doesn't prevent this from
happening.
Dmitriy Zaporozhets
Douwe Maan
Jeroen van Baarsen
Kamil Trzciński
Sullivan SENECHALandSullivan SENECHAL
Achilleas Pipinellis
Robert Schilling
Christian Speich
Stan Hu
Dmitriy Zaporozhets
Sytse Sijbrandij
Thirumal S
Valery Sizov
Kjel Delaey
Robert Schilling
Vincent Lequertier
mutec
Robert Speicher