summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget/components/states
Commit message (Expand)AuthorAgeFilesLines
* Fix frontend tests related to autoMergeStrategyabstract-auto-mergeNathan Friend2019-06-032-10/+14
* Abstract auto merge processesShinya Maeda2019-06-031-7/+7
* Rename vue_component_helper to text_helperfe-rename-vue-component-helper-cePaul Slaughter2019-05-164-4/+4
* 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-233-282/+0
* | Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-221-1/+1
* | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
* | Merge branch 'renovate/gitlab-ui-2.x' into 'master'Clement Ho2019-03-192-2/+2
|\ \ | |/ |/|
| * Fix failing testsBrandon Labuschagne2019-03-182-2/+2
* | 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
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-074-51/+358
* Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-b...Filipa Lacerda2019-01-232-17/+17
|\
| * Use 'delete' instead of 'remove' for source branch25569-changing-wording-to-delete-when-referring-to-removing-a-branchSam Bigelow2019-01-222-17/+17
* | Resolve "When merging an MR, the squash checkbox isn't always supported"Natalia Tepluhina2019-01-152-7/+159
|/
* Disable resolve conflicts for protected branchesPhil Hughes2019-01-071-33/+98
* Fix broken karma specsMike Greiling2018-11-203-3/+7
* Fix typos in comments and specsGeorge Tsiolis2018-11-011-1/+1
* Resolve eslint violationsMike Greiling2018-10-173-0/+5
* Prettify all spec filesMike Greiling2018-10-1716-136/+219
* enable jasmine/new-line-before-expectJohann Hubert Sonntagbauer2018-10-177-0/+60
* Only display merge commit SHA when it existsMark Chao2018-10-151-0/+10
* Uses long sha version of the merged commit in MR widget copy to clipboard bu...48050-add-full-commit-shaFilipa Lacerda2018-06-181-2/+3
* mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-4/+19
* Update MrWidgetAuthorTime and MRWidgetMerged specGeorge Tsiolis2018-06-111-1/+1
* Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+22
* Merge branch 'refactor/move-mr-widget-wip-vue-component' into 'master'Mike Greiling2018-05-021-4/+4
|\
| * Move WorkInProgress vue componentGeorge Tsiolis2018-04-161-4/+4
* | Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-12/+34
* | fix illegal references to "this" in module contextMike Greiling2018-04-231-3/+5
* | convert remaining instances of import * to use spyOnDependencyMike Greiling2018-04-231-5/+4
* | Move PipelineFailed vue componentGeorge Tsiolis2018-04-171-4/+7
|/
* Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into 'mas...Mike Greiling2018-04-161-4/+4
|\
| * Move ReadyToMerge vue componentGeorge Tsiolis2018-03-301-4/+4
* | Adds helpers to remove withespace and linebreaksFilipa Lacerda2018-04-163-3/+3
* | Merge branch 'unresolved-discussions-vue-component-i18n-and-tests' into 'master'Clement Ho2018-04-111-30/+20
|\ \ | |/ |/|
| * Add i18n and update specs for UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-271-30/+20
* | Add i18n and update specs for ShaMismatch vue componentGeorge Tsiolis2018-03-273-13/+26
* | Move ShaMismatch vue componentGeorge Tsiolis2018-03-191-4/+5
|/
* Merge branch 'refactor/move-mr-widget-unresolved-discussions-vue-component' i...Mike Greiling2018-03-191-4/+4
|\
| * Move UnresolvedDiscussions vue componentGeorge Tsiolis2018-03-081-4/+4
* | Merge branch 'refactor/move-mr-widget-nothing-to-merge-vue-component' into 'm...Clement Ho2018-03-121-3/+3
|\ \
| * | Move NothingToMerge vue componentGeorge Tsiolis2018-03-081-3/+3
| |/
* | Merge branch '42814-fix-remove-source-branch-when-mwps' into 'master'Phil Hughes2018-03-121-13/+7
|\ \
| * | Fix "Remove source branch" button in MR widget during MWPS state42814-fix-remove-source-branch-when-mwpsEric Eastwood2018-03-081-13/+7
| |/
* | Dont show remove source branch checkbox when user cannot remove the branchPhil Hughes2018-03-081-8/+4
|/
View Lorry Controller Status