summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-183-3/+9
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-09-131-1/+1
* Make MR pipeline widget text more descriptive (CE)ce-indicator-for-pipeline-for-merge-trainNathan Friend2019-09-111-42/+10
* Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwpsNathan Friend2019-08-222-9/+5
* Remove mergeTrain from FE since it's used only in EEIgor2019-08-221-3/+0
* Resolve "HTML code shown in merge request"Ezekiel Kigbo2019-08-211-0/+1
* Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-textNathan Friend2019-08-143-6/+9
* Fix merge button dropdown (CE)ce-nfriend-fix-the-merge-buttonNathan Friend2019-08-122-5/+5
* Split MR widget into cached and non-cached serializersIgor2019-08-093-48/+59
* Merge branch '62609-test-summary-loading-spinner-is-too-large' into 'master'Mike Greiling2019-08-081-2/+2
|\
| * Adjust size and align MR-widget loading icon62609-test-summary-loading-spinner-is-too-largeDave Pisek2019-08-071-2/+2
* | Disable vue-i18n for non-autofix filesEzekiel Kigbo2019-08-083-0/+7
|/
* Revert "Make status icon in merge widget borderless"Marcel van Remmerden2019-08-051-4/+7
* Remove visual review app feature flag11467-remove-feature-flag-for-visual-review-app-button-ce-backportshampton2019-08-021-1/+1
* Change qa-* class references to js-* for squash-checkboxTanya Pazitny2019-07-291-1/+1
* Align merge request icons and textJarek Ostrowski2019-07-165-11/+11
* Updates on success of an MR the count on top and in other tabsTim Zallmann2019-07-091-0/+3
* Vue-i18n: app/assets/javascripts/vue_merge_request_widget directoryEzekiel Kigbo2019-07-088-46/+75
* replaced string `discussion` with string `thread` in mr-widget component stateMichel Engelen2019-07-021-1/+1
* Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-283-4/+6
* Merge branch 'review-toolbar-data-addition-ce-backport' into 'master'Filipa Lacerda2019-06-172-0/+2
|\
| * Add backport linesreview-toolbar-data-addition-ce-backportsarahghp2019-06-172-0/+2
* | Merge branch 'visual-review-apps-fix-dropdown' into 'master'Mike Greiling2019-06-172-11/+6
|\ \
| * | Move Dropdown to Stick to MR View App ButtonAndrew Fontaine2019-06-172-11/+6
| |/
* | Merge branch 'ce-11981-show-merge-train-position' into 'master'Filipa Lacerda2019-06-171-0/+11
|\ \ | |/ |/|
| * Add merge train position message (CE)Nathan Friend2019-06-171-0/+11
* | Revert "Merge branch '57414-show-pipeline-iid-in-pipelines-page' into 'master'"revert-3a50fc5dKamil TrzciƄski2019-06-141-8/+3
* | Merge branch 'sh-fix-resolve-button-not-available' into 'master'Fatih Acet2019-06-121-1/+1
|\ \ | |/ |/|
| * Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-availableStan Hu2019-06-111-1/+1
* | Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'Lin Jen-Shin2019-06-121-20/+0
|\ \
| * | Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkesNathan Friend2019-06-121-20/+0
| |/
* | Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widgetNathan Friend2019-06-118-37/+85
|/
* Make margin between buttons consistentMarcel van Remmerden2019-06-101-1/+1
* Merge branch '57037-fix-mr-checkboxes-mobile-alignment' into 'master'Fatih Acet2019-06-041-2/+2
|\
| * Fix MR checkboxes alignment on mobile57037-fix-mr-checkboxes-mobile-alignmentPaul Slaughter2019-05-301-2/+2
* | Merge branch 'mr-widget-merge-error' into 'master'Filipa Lacerda2019-06-044-5/+13
|\ \
| * | Update rendering of merge request in merge request widgetPhil Hughes2019-06-044-5/+13
| |/
* | Comply with `no-implicit-coercion` rule (CE)Nathan Friend2019-06-034-9/+9
* | Fix frontend tests related to autoMergeStrategyabstract-auto-mergeNathan Friend2019-06-034-10/+6
* | Abstract auto merge processesShinya Maeda2019-06-034-13/+18
|/
* Add Pipeline IID to viewsMike Scott2019-05-301-3/+8
* Merge branch '58632-fix-mr-widget-padding' into 'master'Mike Greiling2019-05-242-32/+36
|\
| * Fix MR widget padding58632-fix-mr-widget-paddingHeinrich Lee Yu2019-05-202-32/+36
* | Add changes to match eevrt-mr-update-ce-backportsarahghp2019-05-232-2/+2
* | Add backport changesSarah Groff Hennigh-Palermo2019-05-203-18/+59
|/
* Fixes empty block in MR widgetFilipa Lacerda2019-05-071-2/+2
* Merge branch '60808-only-show-target-branch-advanced-error-before-merge' into...Filipa Lacerda2019-04-261-1/+2
|\
| * Only show message when MR is open60808-only-show-target-branch-advanced-error-before-mergeNathan Friend2019-04-241-1/+2
* | Add auto direction to support rtl languagesAhmad Haghighi2019-04-251-0/+1
* | Move EE differences for `ready_to_merge.vue`Natalia Tepluhina2019-04-242-9/+15
|/