summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_failed_to_merge.vue
Commit message (Collapse)AuthorAgeFilesLines
* Add latest changes from gitlab-org/gitlab@13-4-stable-eeGitLab Bot2020-09-191-4/+6
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-181-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-061-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2020-02-061-1/+1
|
* Add latest changes from gitlab-org/gitlab@masterGitLab Bot2019-12-201-1/+6
|
* Allow custom hooks errors to appear in GitLab UILuke Duncalfe2019-03-261-1/+1
| | | | | | | | | | | | | | | | | | Error messages from custom pre-receive hooks now appear in the GitLab UI. This is re-enabling a feature that had been disabled in merge request https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646 The feature had been disabled due to security concerns that information which was not intended to be public (like stack traces) would leak into public view. PreReceiveErrors (from pre-receive, post-receive and update custom hooks) are now filtered for messages that have been prefixed in a particular way. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
* Prettify all the thingsMike Greiling2018-11-201-27/+7
|
* Merge branch 'master' into fl-eslint-vue-house-keepingFilipa Lacerda2018-06-121-1/+5
|\ | | | | | | | | | | | | * master: mergeError message has been binded using v-html directive Find and mark more Git disk access locations, part 2 Ensure MR diffs always exist in the PR importer
| * mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-2/+6
| |
* | Updates eslint vue plugin versionFilipa Lacerda2018-06-111-3/+3
|/
* Rename btn-secondary to btn-defaultAnnabel Dunstone Gray2018-05-101-1/+1
|
* Merge branch 'master' into 'bootstrap4'Clement Ho2018-04-301-49/+53
|\ | | | | | | # Conflicts: # app/views/ci/variables/_variable_row.html.haml
| * Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-49/+53
| |
* | [skip ci] Convert btn-xs to btn-smClement Ho2018-04-121-1/+1
| |
* | Rename .btn-default to .btn-secondaryClement Ho2018-04-091-1/+1
|/
* Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-251-0/+105
- mr_widget_failed_to_merge - mr_widget_merge_when_pipeline_succeeds Adds i18n