summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_mr_widget/components/states
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-2612-12/+12
* Moves mr widget components into vue filesfl-mr-widget-4Filipa Lacerda2018-02-132-21/+35
* Moves missing branch into a vue filefl-mr-widget-missing-branchFilipa Lacerda2018-02-081-25/+9
* Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-261-111/+97
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-252-151/+103
* Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-2/+2
* Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-253-153/+127
|\
| * Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
* | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-242-33/+34
|/
* Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-221-4/+4
|\
| * Backport to match EE icons42225-mr-iconsFilipa Lacerda2018-01-191-4/+4
* | Merge branch 'master' into vue-mr-widget-stateFilipa Lacerda2018-01-191-12/+25
|\ \ | |/
| * Move archived component to vue fileFilipa Lacerda2018-01-181-12/+25
* | Move mr_widget_auto_merge_failed component into a vue fileFilipa Lacerda2018-01-181-21/+36
|/
* Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-171-1/+1
* Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-151-0/+45
* Merge branch 'osw-introduce-merge-request-statistics' into 'master'Sean McGivern2018-01-042-9/+15
|\
| * Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-022-9/+15
* | Switch vue_merge_request_widget to AxiosEric Eastwood2018-01-024-20/+13
|/
* Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-0/+46
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-31/+9