summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'icons-ci-icons' into 'master'Filipa Lacerda2017-11-021-6/+6
|\
| * Fixing IconsTim Zallmann2017-10-301-6/+6
* | Load participants asyncEric Eastwood2017-10-311-1/+1
|/
* Change default disabled merge request widget message to "Merge is not allowed...39188-change-default-disabled-merge-messageEric Eastwood2017-10-271-2/+3
* karma spec fixesPhil Hughes2017-10-101-3/+2
* Flash is now a ES6 modulePhil Hughes2017-10-106-9/+6
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-052-7/+3
* Merge branch '37229-mr-widget-status-icon' into 'master'Jacob Schatz2017-10-051-8/+24
|\
| * Merge remote-tracking branch 'origin' into 37229-mr-widget-status-iconSimon Knox2017-10-032-6/+7
| |\
| * | improve merge request widget status icon UXSimon Knox2017-09-201-8/+24
* | | Merge branch '36742-hide-close-mr-button-on-merge' into 'master'Fatih Acet2017-10-041-0/+1
|\ \ \
| * | | Hide close MR button after merge without reloading pageJacopo2017-09-241-0/+1
| | |/ | |/|
* | | Use explicit boolean true attribute for show-disabled-button38417-use-explicit-boolean-vue-attributeEric Eastwood2017-10-0310-10/+10
* | | Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-033-11/+25
|\ \ \
| * | | fixed specs when merged event was emptymr-widget-merged-date-tooltipPhil Hughes2017-09-291-4/+10
| * | | Fixes merge request widget date tooltip inconsistenciesPhil Hughes2017-09-293-10/+18
| |/ /
* | | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-292-1/+2
* | | Add period to multi-sentence rebase locally messageEric Eastwood2017-09-281-1/+1
* | | Merge branch 'master' into ff_port_from_eeEric Eastwood2017-09-262-6/+7
|\ \ \ | |/ /
| * | Merge branch '37220-es-modules' into 'master'Phil Hughes2017-09-212-6/+7
| |\ \ | | |/ | |/|
| | * Import modules instead of using the ones in global namespaceFilipa Lacerda2017-09-091-4/+5
| | * Use modules in common utilsFilipa Lacerda2017-09-091-2/+2
* | | Use js- classes instead of Vue refs in tests for some perfEric Eastwood2017-09-263-16/+11
* | | Port fast-forward MR widget states from EEEric Eastwood2017-09-194-19/+41
|/ /
* | Change all instances of btn-sm to btn-small to keep things consistentJedidiah2017-09-194-6/+6
* | Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-184-9/+24
* | Fix MR ready to merge buttons/controls at mobile breakpoint37259-some-mr-ready-mobile-fixesEric Eastwood2017-09-131-3/+3
|/
* Fix buttons with different height in merge request widget37331-button-MR-widgetFilipa Lacerda2017-09-011-4/+6
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-075-10/+13
* clean up merge request widget UISimon Knox2017-08-0727-574/+688
* Backport to CE for:2902-standalone-ee-dir-ceLin Jen-Shin2017-08-041-1/+1
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-281-1/+1
* Resolve "Memory usage notice doesn't link anywhere"Tim Zallmann2017-07-262-3/+11
* Make commits behind text a link to the target branch commits pageClement Ho2017-07-112-3/+4
* Convert target branch link to use treeClement Ho2017-07-111-1/+1
* Revert "Merge branch 'winh-mr-widget-no-pipeline' into 'master'"revert-018f7e46Kamil TrzciƄski2017-07-061-8/+1
* Handle missing pipeline in merge request widgetwinh2017-06-261-1/+8
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-215-62/+26
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-195-26/+62
* Changed utilites imports from ~ to relative pathsJose Ivan Vargas2017-06-161-2/+2
* Merge branch '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gon...Fatih Acet2017-05-304-0/+17
|\
| * Added specs for handleNotifications in mr_widget_options_spec.jsLuke "Jared" Bennett2017-05-262-3/+3
| * Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-262-1/+3
| * Restore notifications to MR widgetLuke "Jared" Bennett2017-05-263-0/+15
* | Add performance deltas between app deployments on Merge Request widgetKushal Pandya2017-05-291-11/+33
* | Merge branch '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-a...Fatih Acet2017-05-262-3/+7
|\ \ | |/ |/|
| * Fallback to false when remove_source_branch is null.Bryce Johnson2017-05-251-1/+1
| * Update shouldRemoveSourceBranch against API entity changes.Bryce Johnson2017-05-251-3/+1
| * Shush eslint.Bryce Johnson2017-05-221-1/+1
| * Upgrade Remove Source Branch checkbox UX.Bryce Johnson2017-05-222-3/+9