summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget
Commit message (Collapse)AuthorAgeFilesLines
* Only show message when MR is open60808-only-show-target-branch-advanced-error-before-mergeNathan Friend2019-04-241-0/+16
| | | | | This commit fixes the bug that was causing the "target branch has "advanced" error message to display after an MR was closed.
* Add sync: false to fix Karma tests60605-karma-failingNathan Friend2019-04-161-18/+32
|
* Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' ↵Filipa Lacerda2019-04-163-0/+143
|\ | | | | | | | | | | | | into 'master' Update merge request widget to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25983
| * Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelinesNathan Friend2019-04-153-0/+143
| | | | | | | | | | This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
* | Rename CI related selectorsGeorge Tsiolis2019-04-161-2/+2
|/
* Show Download diff links in closed MRs29249-show-download-diff-even-when-merge-request-is-closedFatih Acet2019-04-031-19/+13
| | | | | Download MR diffs links were only available for open MRs, however it may still be useful for closed MRs.
* Merge branch '48132-display-output-from-pre-receive-scripts' into 'master'Dmitriy Zaporozhets2019-03-261-1/+1
|\ | | | | | | | | | | | | Allow custom hooks errors to appear in GitLab UI Closes #48132 See merge request gitlab-org/gitlab-ce!25625
| * Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
* | Merge branch 'winh-remove-sushi' into 'master'Winnie Hellmann2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430 (cherry picked from commit 79a45f7f02939a1c2fc1f378e43ec9b96630f918)
* | Move some tests from Karma to JestWinnie Hellmann2019-03-236-466/+0
| |
* | Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-221-1/+1
| | | | | | This reverts merge request !26430
* | Merge branch 'winh-remove-sushi' into 'master'Mike Greiling2019-03-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Remove .raw from JavaScript fixture file names Closes #59201 See merge request gitlab-org/gitlab-ce!26430
| * | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | There is nothing more to say but "Commits that change 30 or more lines across at least three files must describe these changes in the commit body"
* | | Update merge request widget pipeline blockNathan Friend2019-03-212-3/+91
|/ / | | | | | | | | | | This commit updates the pipeline block that appears on the merge request page to include information that will be exposed by the API as part of the post-merge pipeline feature.
* | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Clement Ho2019-03-193-3/+3
|\ \ | |/ |/| | | | | Update dependency @gitlab/ui to ^2.3.0 See merge request gitlab-org/gitlab-ce!26181
| * Fix failing testsBrandon Labuschagne2019-03-183-3/+3
| | | | | | | | | | | | | | | | A number of the karma tests looked for the .fa-spinner class or the icon element used for the font awesome spinner class. These instances have been refactored to now look for the .spinner class instead.
* | Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-151-1/+19
|\ \ | |/ |/| | | | | Resolve "Merge request page loses state" See merge request gitlab-org/gitlab-ce!25988
| * Update merge status timeout to 0Paul Slaughter2019-03-141-1/+19
| | | | | | | | - Also stop polling if we get a bad response from the server.
* | Added changelog entryNatalia Tepluhina2019-03-132-9/+138
|/ | | | - fixed tests for edit components
* Added a condition on squash message displayNatalia Tepluhina2019-03-071-3/+17
| | | | - also added a caret back to GlDropdown
* Link to Changed Page if Only One Change PresentAndrew Fontaine2019-02-251-26/+55
| | | | | | Given a static page mapping, and a review app with a single static page change, the review app link will now go directly to that change instead of to the home page of the review app.
* CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-131-0/+2
| | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9001
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-075-51/+360
|
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-2/+2
|
* Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'Clement Ho2019-01-241-6/+16
|\ | | | | | | | | | | | | Bump CI image to use Chrome 71.0 and Golang 1.11 Closes #56614 and #55578 See merge request gitlab-org/gitlab-ce!24572
| * Remove favicon check from mrWidgetOptions specLukas Eipert2019-01-231-6/+16
| | | | | | | | | | | | | | The method that actually creates the favicon is already unit tested, I would have loved to mock it out, but ist is not possible without using rewire. So I decided we just check that the favicon href is changed and use that as a proxy for calling `setFaviconOverlay`
* | Merge branch ↵Filipa Lacerda2019-01-233-20/+20
|\ \ | |/ |/| | | | | | | | | | | | | '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master' Resolve "Changing wording to "Delete" when referring to removing a branch" Closes #25569 See merge request gitlab-org/gitlab-ce!23966
| * Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-223-20/+20
| | | | | | | | This is to match `git branch -D <branchname>`
* | Resolve "When merging an MR, the squash checkbox isn't always supported"Natalia Tepluhina2019-01-152-7/+159
| |
* | Correctly show rebase state in MR widgetPhil Hughes2019-01-101-0/+24
|/ | | | | | | Correctly shows the rebase state even if a merge requests pipeline has failed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/45942
* Disable resolve conflicts for protected branchesPhil Hughes2019-01-071-33/+98
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
* Move merge request collaboration message into a constant.Harry Kiselev2018-12-271-3/+5
|
* Update condition to visibility collaboration status text, #44642.Harry Kiselev2018-12-251-0/+47
|
* Set cached MRWidget SHA after rebaseSam Bigelow2018-12-143-11/+18
| | | | | | Update changelog to include Merge Request ID and Author Update changelog to include Merge Request ID and Author
* Redesign of MR header sections (CE Port)Paul Slaughter2018-11-304-0/+184
| | | | | | | - https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8593 - Create mr-widget-icon to encapsulate circle icons - Decouple workflow L&F from mr-widget-heading - Decouple container L&F from mr-widget-heading
* Merge branch '53578-fe-deployment-status' into 'master'Phil Hughes2018-11-211-0/+28
|\ | | | | | | | | Adds missing status in deployment widget See merge request gitlab-org/gitlab-ce!23239
| * Adds missing status in deployment widget53578-fe-deployment-statusFilipa Lacerda2018-11-201-0/+28
| | | | | | | | Renders created and canceled status in MR widget
* | Fix broken karma specsMike Greiling2018-11-204-5/+12
|/
* Don't show memory usage graph for unmerged MRsSimon Knox2018-11-191-2/+25
|
* Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-122-48/+0
|
* Disable stop environment button while deployment is runningFilipa Lacerda2018-11-061-0/+4
|
* Renders unescaped `sprinft` stringFilipa Lacerda2018-11-061-1/+1
|
* Merge branch 'gt-update-typos-in-comments-and-specs' into 'master'Achilleas Pipinellis2018-11-011-1/+1
|\ | | | | | | | | Fix typos in comments and specs See merge request gitlab-org/gitlab-ce!22683
| * Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
| |
* | Prettify remaining files with differences in CE and EEMike Greiling2018-10-313-66/+70
| |
* | Merge branch ↵Filipa Lacerda2018-10-312-1/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * | Regenerates pot filesFilipa Lacerda2018-10-242-1/+11
| | | | | | | | | | | | Makes documentation path a required prop
| * | Change CI status error messageMatija Čupić2018-10-241-1/+1
| | |
* | | Runs prettier on changed files53227-empty-listFilipa Lacerda2018-10-301-1/+1
| | |
* | | Prevents review app to render an empty dropdown.Filipa Lacerda2018-10-302-0/+58
| |/ |/| | | | | | | | | | | | | When a deployment has no files to show in the dropdown we fallback to the regular single button for the review app link. This commit moves the review app link into a component since it's used twice.
View Lorry Controller Status