summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
Commit message (Collapse)AuthorAgeFilesLines
* Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-051-0/+1
| | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38389
* Merge branch 'mr-widget-merged-date-tooltip' into 'master'Filipa Lacerda2017-10-031-5/+19
|\ | | | | | | | | | | | | Fixes merge request widget date tooltip inconsistencies Closes #38545 See merge request gitlab-org/gitlab-ce!14578
| * 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-291-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the merge request widget would use the `updated_at` date as the tooltip text for both closed & merged states. This is incorrect as the `updated_at` date is actually changed when a user updates merge request through commenting, description changes or anything else. The widget states for merged & closed events now use their own event object which holds their own `updated_at` date string. Also this text has been correctly formatted through our date utilities to correctly display the right timezone data in a user friendly way. Closes #38545
* | Port semi-linear merge strategy to CE (mostly FE)Eric Eastwood2017-09-291-0/+1
| |
* | Port fast-forward MR widget states from EEEric Eastwood2017-09-191-0/+1
|/ | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/20076
* Fix MR widget with external CI services/integrations33287-fix-mr-widget-errors-with-external-servicesEric Eastwood2017-09-181-1/+3
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33287 The MR widget was trying to render the pipelines section when there are no GitLab CI pipelines which was throwing some NPE errors.
* Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-3/+6
|
* Merge issuable "reopened" state into "opened"merge-issuable-reopened-into-opened-stateYorick Peterse2017-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having two states that essentially mean the same thing is very much like having a boolean "true" and boolean "mostly-true": it's rather silly. This commit merges the "reopened" state into the "opened" state while taking care of system notes still showing messages along the lines of "Alice reopened this issue". A big benefit from having only two states (opened and closed) is that indexing and querying becomes simpler and more performant. For example, to get all the opened queries we no longer have to query both states: SELECT * FROM issues WHERE project_id = 2 AND state IN ('opened', 'reopened'); Instead we can query a single state directly, which can be much faster: SELECT * FROM issues WHERE project_id = 2 AND state = 'opened'; Further, only having two states makes indexing easier as we will only ever filter (and thus scan an index) using a single value. Partial indexes could help but aren't supported on MySQL, complicating the development process and not being helpful for MySQL.
* Make commits behind text a link to the target branch commits pageClement Ho2017-07-111-1/+2
|
* Convert target branch link to use treeClement Ho2017-07-111-1/+1
|
* Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"winh-revert-6ac777a7592533d9c7b3682b2b9ca8caccca3f4dwinh2017-06-211-13/+0
| | | | | This reverts commit 6ac777a7592533d9c7b3682b2b9ca8caccca3f4d, reversing changes made to 025cbc2ad4dc175634676ff8a6955e043512d8bf.
* Adjust position and wording for related issues in merge requestsWinnie Hellmann2017-06-191-0/+13
|
* Merge branch ↵Fatih Acet2017-05-301-0/+2
|\ | | | | | | | | | | | | | | | | '32916-browser-notifications-for-pipeline-running-in-a-mr-is-gone' into 'master' Resolve "Browser notifications for pipeline running in a MR is gone" Closes #32916 See merge request !11734
| * Move gon ref to the index to avoid depending on gon in any mr widget objectsLuke "Jared" Bennett2017-05-261-1/+1
| |
| * Restore notifications to MR widgetLuke "Jared" Bennett2017-05-261-0/+2
| |
* | Merge branch ↵Fatih Acet2017-05-261-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | '32447-remove-source-branch-is-displayed-to-mergers-who-cannot-actually-delete-the-source-branch-from-a-forked-project' into 'master' Disable "Remove source branch" in MR Widget for users who can't remove, and re-add checkbox to MR form Closes #32447 and #32907 See merge request !11558
| * 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-221-1/+3
| |
* | ensure MergeRequestStore sha value never changes after instantiation32480-follow-up-from-add-sha-mismatch-state-to-the-mr-widgetMike Greiling2017-05-171-3/+2
|/
* MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-161-0/+1
|
* add sha-mismatch state to mr-widget to prevent accidental merges when branch ↵Mike Greiling2017-05-111-0/+2
| | | | unknowingly changes
* Merge request widget redesignFatih Acet2017-05-091-0/+134