diff options
author | Nick Thomas <nick@gitlab.com> | 2019-08-08 17:15:27 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2019-08-08 17:15:27 +0000 |
commit | cbf55ac4e66599437b0003a20e15e6e303891ae4 (patch) | |
tree | be9cba6a1a531932b121844f1bad9b21c42b0526 /app/views | |
parent | abcb42e00055398f738941c8e661255eb95938f4 (diff) | |
download | gitlab-ce-cbf55ac4e66599437b0003a20e15e6e303891ae4.tar.gz |
Rename blocking MRs to cross-project MR dependencies
We're removing the ability for MRs in a single project to block each
other, and performing a rename of the feature to go along with that.
This necessitates documentation changes
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/shared/issuable/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/issuable/form/_metadata.html.haml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml index 07a7b5ce9de..214e87052da 100644 --- a/app/views/shared/issuable/_form.html.haml +++ b/app/views/shared/issuable/_form.html.haml @@ -33,8 +33,6 @@ = render_if_exists 'shared/issuable/approvals', issuable: issuable, presenter: presenter, form: form -= render_if_exists "shared/issuable/form/merge_request_blocks", issuable: issuable, form: form - = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form = render 'shared/issuable/form/merge_params', issuable: issuable diff --git a/app/views/shared/issuable/form/_metadata.html.haml b/app/views/shared/issuable/form/_metadata.html.haml index 1e03440a5dc..90a6a98235d 100644 --- a/app/views/shared/issuable/form/_metadata.html.haml +++ b/app/views/shared/issuable/form/_metadata.html.haml @@ -23,6 +23,7 @@ = render "shared/issuable/label_dropdown", classes: ["js-issuable-form-dropdown"], selected: issuable.labels, data_options: { field_name: "#{issuable.class.model_name.param_key}[label_ids][]", show_any: false }, dropdown_title: "Select label" = render_if_exists "shared/issuable/form/weight", issuable: issuable, form: form + = render_if_exists "shared/issuable/form/merge_request_blocks", issuable: issuable, form: form - if has_due_date .col-lg-6 |