summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil Trzciński2019-06-143-22/+13
* Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-121-2/+73
|\
| * Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-111-2/+73
* | Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'Lin Jen-Shin2019-06-121-54/+0
|\ \
| * | Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkesNathan Friend2019-06-121-54/+0
| |/
* | Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widgetNathan Friend2019-06-114-67/+180
|/
* FE: Remove legacy approval feature in MR filesPaul Slaughter2019-06-041-2/+0
* Fix frontend tests related to autoMergeStrategyabstract-auto-mergeNathan Friend2019-06-032-10/+14
* Abstract auto merge processesShinya Maeda2019-06-031-7/+7
* Add Pipeline IID to viewsMike Scott2019-05-303-13/+22
* Merge branch 'fe-rename-vue-component-helper-ce' into 'master'Mike Greiling2019-05-205-5/+5
|\
| * Rename vue_component_helper to text_helperfe-rename-vue-component-helper-cePaul Slaughter2019-05-165-5/+5
* | Add backport changesSarah Groff Hennigh-Palermo2019-05-202-4/+37
|/
* Fixes empty block in MR widgetFilipa Lacerda2019-05-071-0/+13
* Only show message when MR is open60808-only-show-target-branch-advanced-error-before-mergeNathan Friend2019-04-241-0/+16
* 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' i...Filipa Lacerda2019-04-163-0/+143
|\
| * Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelinesNathan Friend2019-04-153-0/+143
* | 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
* 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 UILuke Duncalfe2019-03-261-1/+1
* | Merge branch 'winh-remove-sushi' into 'master'Winnie Hellmann2019-03-261-1/+1
* | 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
* | Merge branch 'winh-remove-sushi' into 'master'Mike Greiling2019-03-211-1/+1
|\ \
| * | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
* | | Update merge request widget pipeline blockNathan Friend2019-03-212-3/+91
|/ /
* | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Clement Ho2019-03-193-3/+3
|\ \ | |/ |/|
| * Fix failing testsBrandon Labuschagne2019-03-183-3/+3
* | Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-151-1/+19
|\ \ | |/ |/|
| * Update merge status timeout to 0Paul Slaughter2019-03-141-1/+19
* | Added changelog entryNatalia Tepluhina2019-03-132-9/+138
|/
* Added a condition on squash message displayNatalia Tepluhina2019-03-071-3/+17
* Link to Changed Page if Only One Change PresentAndrew Fontaine2019-02-251-26/+55
* CE Port of Multiple merge request approval rulesPaul Slaughter2019-02-131-0/+2
* 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
|\
| * Remove favicon check from mrWidgetOptions specLukas Eipert2019-01-231-6/+16
* | Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-b...Filipa Lacerda2019-01-233-20/+20
|\ \ | |/ |/|
| * Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-223-20/+20
* | 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
|/
* Disable resolve conflicts for protected branchesPhil Hughes2019-01-071-33/+98
* 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
* Redesign of MR header sections (CE Port)Paul Slaughter2018-11-304-0/+184
* Merge branch '53578-fe-deployment-status' into 'master'Phil Hughes2018-11-211-0/+28
|\
View Lorry Controller Status