summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
Commit message (Collapse)AuthorAgeFilesLines
* Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwpsNathan Friend2019-08-221-3/+3
| | | | This commit does a find-and-replace from ATMTWPS -> MTWPS.
* Remove mergeTrain from FE since it's used only in EEIgor2019-08-221-3/+0
|
* Add merge train helper text to MR widget (CE)ce-11982-merge-trains-helper-textNathan Friend2019-08-141-0/+3
| | | | | | | | | | This commit adds a helper text that describes what will happen when a user clicks the "Start/Add to merge train when pipeline succeeds" button. This text appears at the bottom of the merge request widget. In addition, this commit renames the "merge_train_info" component to "merge_train_position_indicator" to avoid ambiguity with the "merge_train_helper_text" component.
* Split MR widget into cached and non-cached serializersIgor2019-08-091-45/+47
| | | | | | | | | Splits auto-refreshing of MR widget into 2 requests: - the one which uses etag-caching and invalidates the fields on change - the one without caching The idea is to gradually move all the fields to etag-cached endpoint
* Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-281-1/+2
| | | | | | This commits extracts /merge_requests/1.json?serializer=widget Into a separate /merge_requests/1/widget.json endpoint This will allow to use caching for this request
* Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widgetNathan Friend2019-06-111-1/+21
| | | | | This commit updates the merge request widget's "Merge" button to support merge trains.
* Comply with `no-implicit-coercion` rule (CE)Nathan Friend2019-06-031-3/+3
| | | | | | | | This commit is the result of running `yarn eslint --fix` after enabling the `no-implicit-coercion` ESLint rule. This rule has been added to our ESLint config here: https://gitlab.com/gitlab-org/gitlab-eslint-config/merge_requests/14
* Fix frontend tests related to autoMergeStrategyabstract-auto-mergeNathan Friend2019-06-031-1/+1
| | | | | A few minor frontend changes to complete the refactoring from MWPS to the more generic autoMergeStrategy.
* Abstract auto merge processesShinya Maeda2019-06-031-4/+5
| | | | | | | | | | | | We have one auto merge strategy today - Merge When Pipeline Succeeds. In order to add more strategies for Merge Train feature, we abstract the architecture to be more extensible. Removed arguments Fix spec
* Merge branch 'nfriend-update-merge-request-widget-for-post-merge-pipelines' ↵Filipa Lacerda2019-04-161-0/+5
|\ | | | | | | | | | | | | into 'master' Update merge request widget to accommodate post-merge pipelines See merge request gitlab-org/gitlab-ce!25983
| * Add two warning messages to the MR widgetnfriend-update-merge-request-widget-for-post-merge-pipelinesNathan Friend2019-04-151-0/+5
| | | | | | | | | | This commit adds two new warning messages to the MR widget that handle cases involving merge request pipelines.
* | Rename CI related selectorsGeorge Tsiolis2019-04-161-1/+1
|/
* Resolve "Override squash commit message"Natalia Tepluhina2019-02-071-0/+2
|
* Allow custom squash commit messagesLuke Duncalfe2019-02-061-2/+2
|
* Use ee_else_ce alias in merge request widgetWinnie Hellmann2019-01-301-1/+1
| | | | (cherry picked from commit 5c35cdc929abf5251512ba6ddf7078e570232709)
* Disable resolve conflicts for protected branchesPhil Hughes2019-01-071-0/+2
| | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53463
* Set cached MRWidget SHA after rebaseSam Bigelow2018-12-141-2/+6
| | | | | | Update changelog to include Merge Request ID and Author Update changelog to include Merge Request ID and Author
* Prettify remaining files with differences in CE and EEMike Greiling2018-10-311-2/+1
|
* Merge branch ↵Filipa Lacerda2018-10-311-0/+2
|\ | | | | | | | | | | | | | | | | '41545-gitlab-merge-request-status-could-not-connect-to-the-ci-server-please-check-your-settings-and-try-again' into 'master' Resolve "Reword error message for internal CI unknown pipeline status" Closes #53056 See merge request gitlab-org/gitlab-ce!22474
| * Fix rspec error text regexMatija Čupić2018-10-241-1/+2
| |
| * Updates CI/CD documentation link in MR widgetFilipa Lacerda2018-10-241-1/+1
| |
| * Fix the troubleshooting docs linkMatija Čupić2018-10-241-2/+1
| |
| * Add docs linkMatija Čupić2018-10-241-0/+2
| |
* | post merge pipeline and environments statusAlessio Caiazza2018-10-291-0/+2
| |
* | Resolve circular dependencies in merge request widgetwinh-split-merge-request-widget-dependenciesWinnie Hellmann2018-10-251-1/+1
|/
* Adds frontend support to render test reports on theMR widgetFilipa Lacerda2018-08-021-0/+2
| | | | | | | Creates an app to render grouped test reports in the MR widget Ports CSS from EE into CE Creates a reusable code component Adds getters and utils to the existing reports store
* Allow merge requests from forks to be opened in Web IDEPhil Hughes2018-07-121-3/+7
| | | | Closes #47460
* Uses long sha version of the merged commit in MR widget copy to clipboard ↵48050-add-full-commit-shaFilipa Lacerda2018-06-181-0/+1
| | | | button
* Rephrase "maintainer" to more precise "members who can merge to the target ↵42751-rename-mr-maintainer-pushMark Chao2018-06-011-1/+1
| | | | | | branch" "Maintainer" will be freed to be used for #42751
* Add 'squash and rebase' feature to CEblackst0ne-squash-and-merge-in-gitlab-core-ceblackst0ne2018-05-291-0/+5
|
* Display merge commit SHA in merge widget after mergeOswaldo Ferreira2018-05-071-0/+2
|
* Fix removes source branch text being rendered in merged stateremoves-source-branch-widget-statePhil Hughes2018-03-121-0/+4
|
* Allow a user to select `allow maintainer to push`Bob Van Landuyt2018-03-071-0/+1
| | | | | | When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
* Harmonize CE and EE JS codereduce-ce-ee-disrepancies-in-jsRémy Coutable2018-02-221-2/+0
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+8
| | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* Fixes spec failures due to not returning metrics for MRs other than ↵Oswaldo Ferreira2018-01-021-0/+4
| | | | closed/merged
* Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-021-24/+18
|
* Remove related links in MR widget when empty stateClement Ho2017-12-191-0/+5
|
* Export date utility functions as ES6 modulesFilipa Lacerda2017-12-071-1/+2
|
* 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
|