summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fix layout issues with blame tableblame-ui-fixPhil Hughes2016-09-063-21/+7
| | | | Closes #21216
* Merge branch '21857-refactor-merge-requests-documentation' into 'master' Achilleas Pipinellis2016-09-052-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor merge requests documentation ## What does this MR do? Add more information on merge requests. ## Moving docs to a new location? See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location - [x] Make sure the old link is not removed and has its contents replaced with a link to the new location. - [x] Make sure internal links pointing to the document in question are not broken. - [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory. - [x] If working on CE, submit an MR to EE with the changes as well. --- Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21857 See merge request !6202
| * Add links to new docs in merge_requests.md and workflow/README.mdAchilleas Pipinellis2016-09-051-2/+3
| |
| * Move "Only allow merge requests to be merged if the build succeeds" to new ↵Achilleas Pipinellis2016-09-051-1/+1
| | | | | | | | location
* | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-0523-76/+91
|\ \ | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Scope hooks thal will run for confidential issuesDouglas Barbosa Alexandre2016-08-313-5/+6
| | |
| * | Add option to confidential issues events to trigger servicesDouglas Barbosa Alexandre2016-08-315-6/+9
| | |
| * | Add option to confidential issues events to trigger WebhooksDouglas Barbosa Alexandre2016-08-314-1/+10
| | |
| * | Fix confidential issues should not be passed to WebhooksDouglas Barbosa Alexandre2016-08-311-0/+2
| | |
| * | Refactoring Import::BaseController#find_or_create_namespaceDouglas Barbosa Alexandre2016-08-318-47/+53
| | |
| * | Don't create groups for unallowed users when importing projectsDouglas Barbosa Alexandre2016-08-318-26/+20
| | |
* | | Merge branch 'fix-missing-flash-messages' into 'master' Rémy Coutable2016-09-051-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix missing flash messages on service edit page ## What does this MR do? This MR fixes missing post-update flash notifications for service edit page. Bug was introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/76aad9b76ed756ca9ba2cbcdb399c815e542b3ae#3ca7aff54d2814b971a98a7bf2837e07ab3dfa04_21_20 and caused by passing `notice: Successfully updated.` to path helper instead of passing it to `redirect_to` due to wrong parenthesis placement. ## Why was this MR needed? While adding HipChat integration I noticed that no messages are being displayed after clicking on "Save changes" button. I looked into code and observed that there is a code for these messages which once worked but doesn't work anymore. It's a regression which should be fixed. ## Screenshots (if relevant) ![image](/uploads/32b851e5bdc2a6438f35061473db9650/image.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6195
| * | | Fix missing flash messages on service edit pageAirat Shigapov2016-09-051-3/+2
| | |/ | |/|
* | | Merge branch 'safe-ref-updates' into 'master' Douwe Maan2016-09-051-20/+21
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Safer ref updates Use `git update-ref` to prevent clobbering concurrent ref updates. If rugged/libgit2 is temporarily confused, due to concurrent `git gc` for example, then it used to be possible to accidentally reset a ref to an earlier state and lose commits. Because `git update-ref` does not get confused by `git gc`, what will happen now is that the commit based on confused information fails, preventing data loss. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20353 See merge request !6130
| * | Make error message appropriate for end usersJacob Vosmaer2016-09-021-2/+2
| | |
| * | Use 'git update-ref' for safer web commitsJacob Vosmaer2016-09-021-20/+21
| | |
* | | Merge branch 'fix-suggested-colors-underline' into 'master' Annabel Dunstone Gray2016-09-021-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove suggested colors hover underline ## What does this MR do? * Removes the blue hover underline for the suggested color containers * Added `cursor: pointer` to the suggested color containers ## Are there points in the code the reviewer needs to double check? Shouldn't be :smile: ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![DS48AvgSVX](/uploads/0077e7a5837c8ce9fe2493ad6a42a018/DS48AvgSVX.gif) After: ![olZzS68WNr](/uploads/4e0ae808c69942a528f1303df8cddeae/olZzS68WNr.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21792 See merge request !6165
| * | | Remove suggested colors hover underlineClement Ho2016-09-021-0/+1
| | | |
* | | | Merge branch 'icon-button-alignment' into 'master' Fatih Acet2016-09-023-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of icon buttons ## What does this MR do? Fix misalignment of buttons with only an icon which was introduced by !5451. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5451#note_14066627 ## Screenshots ### Before ![with-text](/uploads/aa7f7a98e2015070689e762e0cf99844/witht-text.png) ![without-text](/uploads/72db7c54e3961fd0df34b0ea79455fd0/without-text.png) ### After ![with-text](/uploads/3f19e55773083bcb22f3909f6dc0d147/witht-text.png) ![without-text](/uploads/b6647d4d71eb5cd9d1712908d2b93665/without-text.png) See merge request !5887
| * | | | Fix alignment of icon buttons (!5887)winniehell2016-08-193-5/+7
| | | | |
* | | | | Merge branch 'fix-wiki-anchor-interaction' into 'master' Fatih Acet2016-09-023-17/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown anchor icon interaction ## What does this MR do? Fixes and improves the markdown anchor icon interaction so that hovering over any headers (generated through markdown) will have an anchor icon that's easily accessible (won't hide from you on edge cases), replaced the icon with fontAwesome icon and added more padding for the anchor icon. ## Are there points in the code the reviewer needs to double check? 1. Need to check if it's okay to replace the icon-link.png with fontAwesome 2. Need to check if it's okay for the additional view padding on views that render markdown to compensate for anchor link space 3. Need to check if there are any other views that render markdown that did not have it's padding re-adjusted ## Why was this MR needed? Improve markdown rendered anchor links so that they are more user friendly ## What are the relevant issue numbers? Closes #20459 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-07-30_at_2.31.43_PM](/uploads/12b2aad7f130d26a709ff28083ecc2e3/Screen_Shot_2016-07-30_at_2.31.43_PM.png) After: ![Screen_Shot_2016-08-08_at_10.25.06_AM](/uploads/caac1985cfbd305b8c8665d86e30ab24/Screen_Shot_2016-08-08_at_10.25.06_AM.png) Before: ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif](https://gitlab.com/gitlab-org/gitlab-ce/uploads/45e6d0aee7abbdb42a4c781ae0ba1961/ws7MBrK70g.gif) After: ![nLQOMn9RUO](/uploads/3905ceac2d591399d14cec1b3319f46b/nLQOMn9RUO.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5577
| * | | | | Fix markdown anchor icon interactionClement Ho2016-09-023-17/+11
| | | | | |
* | | | | | Merge branch '21471-bold-text-in-ci-build-output-not-styled' into 'master' Annabel Dunstone Gray2016-09-021-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added `.term-bold` declaration. ## What does this MR do? Added `.term-bold` declaration. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/21471#note_14874299 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #21471 See merge request !6171
| * | | | | | Added `.term-bold` declaration.21471-bold-text-in-ci-build-output-not-styledLuke "Jared" Bennett2016-09-021-0/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'fix-add-button-alignment' into 'master' Fatih Acet2016-09-021-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align add button on repository view ## What does this MR do? Top aligns the add button to the other UI elements adjacent to it :smile: ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Fixes a UI inconsistency ## What are the relevant issue numbers? Closes #21168 ## Screenshots (if relevant) Before: ![Screen_Shot_2016-08-24_at_3.53.00_PM__2_](/uploads/5d6d765bb8a1d640170805ec32956790/Screen_Shot_2016-08-24_at_3.53.00_PM__2_.png) After: ![Screen_Shot_2016-08-24_at_3.52.44_PM__2_](/uploads/1db9f0f68ef5defa4dd111d7dae1dc26/Screen_Shot_2016-08-24_at_3.52.44_PM__2_.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5971
| * | | | | | Align add button on repository viewClement Ho2016-09-011-0/+4
| |/ / / / /
* | | | | | Merge branch 'project-edit-features-hide' into 'master' Fatih Acet2016-09-023-18/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hides merge request section in edit project when disabled ## What does this MR do? Correctly hides the merge request section in the project edit page when disabled. It used to work before the feature visibility part was changed to dropdown - so added a test to prevent in future! :thumbsup: ## Screenshots (if relevant) ![hide](/uploads/eb72ef87bad19c2716472a0c1031fd32/hide.gif) See merge request !6175
| * | | | | | Refactored code to rely less on IDs that could changeproject-edit-features-hidePhil Hughes2016-09-022-6/+14
| | | | | | |
| * | | | | | Hides merge request section in edit project when disabledPhil Hughes2016-09-022-15/+18
| |/ / / / /
* | | | | | Merge branch 'commit-message-scroll' into 'master' Fatih Acet2016-09-0210-83/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit message blocks #### What does this MR do? * Wraps code commit message blocks * Consolidates similar shades of gray (cc @cperessini @tauriedavis) Related to #20831 #### Screenshots (if relevant) Before: ![Screen_Shot_2016-08-19_at_10.41.07_AM](/uploads/4529d178123e18b0aad35a252061902b/Screen_Shot_2016-08-19_at_10.41.07_AM.png) After: ![Screen_Shot_2016-08-19_at_10.40.42_AM](/uploads/499818f360e7c3cd9d31bc335cae1a82/Screen_Shot_2016-08-19_at_10.40.42_AM.png) See merge request !5906
| * | | | | | Wrap commit message blocksAnnabel Dunstone2016-08-281-0/+2
| | | | | | |
| * | | | | | Remove #faf9f9 and #f9f9f9 from color palette; replace with #fafafaAnnabel Dunstone2016-08-2810-83/+82
| | | | | | |
* | | | | | | Merge branch 'member-expiration-date-on-update' into 'master' Douwe Maan2016-09-022-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix expiration date picker after update @DouweM this object is now on `gl`, not on the window. It would only break when trying to use the date picker on a newly-inserted member element, but I figure it's probably worth sneaking into a patch. See merge request !6184
| * | | | | | | Fix expiration date picker after updateSean McGivern2016-09-022-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '21122-move-list-of-builds-to-bottom-of-sidebar' into 'master' Annabel Dunstone Gray2016-09-022-38/+45
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved builds panel to the bottom of the builds sidemenu (and change retry link colour) ## What does this MR do? Moves the builds panel to the bottom of the builds sidemenu. Changes the `Retry` link to look more _linky_. :paperclips: ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? On small screens, the builds panel must be scrolled through before you can get to the details of the build you're looking at. ## What are the relevant issue numbers? Closes #21122 ## Screenshots (if relevant) ![Screen_Shot_2016-08-20_at_17.41.51](/uploads/84f10c43011da514ef8ac1b1d20eb5d5/Screen_Shot_2016-08-20_at_17.41.51.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) Closes #21122 See merge request !5923
| * | | | | | Review changes21122-move-list-of-builds-to-bottom-of-sidebarLuke Bennett2016-08-231-1/+1
| | | | | | |
| * | | | | | Changed `retry` link to blueLuke Bennett2016-08-232-1/+8
| | | | | | |
| * | | | | | Moved builds panel to the bottom of the builds sidemenuLuke Bennett2016-08-232-36/+36
| | | | | | |
* | | | | | | Merge branch 'fix/handle-raw-trace-error-on-old-builds' into 'master' Douwe Maan2016-09-023-8/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle error on trace raw download with old builds (DB stored) ## What does this MR do? Handles error on `raw build trace` download action for old builds (which are stored in DB instead of file). ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? At the beginning build traces were stored in database but at some point we moved to store them in files. All trace related actions are aware of this, but not `raw trace download`. ## What are the relevant issue numbers? Fixes #18900 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4822
| * | | | | | | Refactor Ci::Build#raw_tracefix/handle-raw-trace-error-on-old-buildsTomasz Maczukin2016-09-011-5/+2
| | | | | | | |
| * | | | | | | Update specs - add mocks to simulate old versionsTomasz Maczukin2016-09-013-7/+11
| | | | | | | |
| * | | | | | | Change 404 to 410 error when raw trace is unavailableTomasz Maczukin2016-09-012-1/+5
| | | | | | | |
| * | | | | | | Refactorize CI::Build modelTomasz Maczukin2016-09-011-2/+10
| | | | | | | |
| * | | | | | | Handle error on trace raw download with old builds (DB stored)Tomasz Maczukin2016-09-013-2/+6
| | | | | | | |
* | | | | | | | Merge branch 'zj-fix-gitlab-import' into 'master' Douwe Maan2016-09-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitLab import button cc @MrChrisW Closes gitlab-org/gitlab-ce#21795 See merge request !6167
| * | | | | | | | Fix GitLab import buttonzj-fix-gitlab-importZ.J. van de Weg2016-09-021-1/+1
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/merge-request-close-message' into 'master' Douwe Maan2016-09-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend blank line to close message on merge request ## What does this MR do? Adds a new line above the "Closes" message on a merge request. ## Why was this MR needed? Autoappended `Closes` to the end of merge request needs a new line in the beginning. When using descriptive commit messages and the commit message body is used for the body of the merge request the Closes message should appear on a line by itself. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #21710 See merge request !6151
| * | | | | | | | Prepend blank line to close message on merge requestLuke Howell2016-09-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added an extra new line to the prepend of the Close message Fixes #21710
* | | | | | | | | Merge branch 'new-branch-unavailable-color' into 'master' Fatih Acet2016-09-022-11/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove green outline from `New branch unavailable` button on issue page ## What does this MR do? - remove mistakenly added green outline from `New branch unavailable` button on issue page - remove mistakenly added green outline from `Checking branches...` button on issue page ## Why was this MR needed? `New branch unavailable` and `Checking branches...` buttons had green outline though that should only be added to the `New branch` button. ## What are the relevant issue numbers? fixes #21006 ## Screenshots ### Before ![before-checking](/uploads/f37f62c99602143d7ddc27fead4035c5/before-checking.png) ![before-new-branch](/uploads/4926f7c57b97831496c79b4176ad02a3/before-new-branch.png) ![before-unavailable](/uploads/041c32fa7eef86403c3ee749d4f1131a/before-unavailable.png) ### After ![after-checking](/uploads/918484eca0ccda2d27a8bb3e08a569fb/after-checking.png) ![after-new-branch](/uploads/ae380933d3e82117c887dabfb06a915a/after-new-branch.png) ![after-unavailable](/uploads/d861b3b379de404c62cf27a7207b005c/after-unavailable.png) See merge request !5858
| * | | | | | | | Remove green outline from `New branch unavailable` button on issue page (!5858)winniehell2016-08-242-11/+9
| | | | | | | | |