diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 03:06:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-08 03:06:10 +0300 |
| commit | ca95fe0b55e6a350aeb978ecc7fbd31c44ab84f4 (patch) | |
| tree | e23037ca692a991665930dd0de90d0a05c56659d /app | |
| parent | 8c8b94e7116fa478ad490bd14c09565d23097f57 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app')
5 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/boards/components/board_form.vue b/app/assets/javascripts/boards/components/board_form.vue index ebf48cee2ae..34560560756 100644 --- a/app/assets/javascripts/boards/components/board_form.vue +++ b/app/assets/javascripts/boards/components/board_form.vue @@ -194,6 +194,7 @@ export default { ref="name" v-model="board.name" class="form-control" + data-qa-selector="board_name_field" type="text" :placeholder="__('Enter board name')" @keyup.enter="submit" diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index df4c992a046..16360c7139a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -168,7 +168,7 @@ module ProjectsHelper end def link_to_autodeploy_doc - link_to _('About auto deploy'), help_page_path('ci/autodeploy/index'), target: '_blank' + link_to _('About auto deploy'), help_page_path('autodevops/index.md#auto-deploy'), target: '_blank' end def autodeploy_flash_notice(branch_name) diff --git a/app/views/layouts/header/_current_user_dropdown.html.haml b/app/views/layouts/header/_current_user_dropdown.html.haml index b636725fabf..efe74ddd902 100644 --- a/app/views/layouts/header/_current_user_dropdown.html.haml +++ b/app/views/layouts/header/_current_user_dropdown.html.haml @@ -32,7 +32,8 @@ %li.d-md-none = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) - = render 'shared/user_dropdown_contributing_link' + %li.d-md-none + = render 'shared/user_dropdown_contributing_link' = render_if_exists 'shared/user_dropdown_instance_review' - if Gitlab.com? %li.js-canary-link.d-md-none diff --git a/app/views/layouts/header/_help_dropdown.html.haml b/app/views/layouts/header/_help_dropdown.html.haml index 41d7aa3741a..71977b23481 100644 --- a/app/views/layouts/header/_help_dropdown.html.haml +++ b/app/views/layouts/header/_help_dropdown.html.haml @@ -9,7 +9,8 @@ %li = link_to _("Submit feedback"), "https://about.gitlab.com/submit-feedback" - if current_user_menu?(:help) || current_user_menu?(:settings) || current_user_menu?(:profile) - = render 'shared/user_dropdown_contributing_link' + %li + = render 'shared/user_dropdown_contributing_link' = render_if_exists 'shared/user_dropdown_instance_review' - if Gitlab.com? %li.js-canary-link diff --git a/app/views/shared/_user_dropdown_contributing_link.html.haml b/app/views/shared/_user_dropdown_contributing_link.html.haml index 564d21a39be..d4c3e11d051 100644 --- a/app/views/shared/_user_dropdown_contributing_link.html.haml +++ b/app/views/shared/_user_dropdown_contributing_link.html.haml @@ -1,3 +1,2 @@ -%li - = link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do - = _("Contribute to GitLab") += link_to "https://about.gitlab.com/contributing", target: '_blank', class: 'text-nowrap' do + = _("Contribute to GitLab") |