diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0000 |
| commit | 946771d0b016ae92b15a60bc3290a33b94191ffe (patch) | |
| tree | 64862c2433989483f5fce45d5539242577a362eb /app/views | |
| parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) | |
| download | gitlab-ce-946771d0b016ae92b15a60bc3290a33b94191ffe.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_analytics_links.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/forks/new.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/wikis/_form.html.haml | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/app/views/layouts/nav/sidebar/_analytics_links.html.haml b/app/views/layouts/nav/sidebar/_analytics_links.html.haml index e87cf92374a..90f9432af03 100644 --- a/app/views/layouts/nav/sidebar/_analytics_links.html.haml +++ b/app/views/layouts/nav/sidebar/_analytics_links.html.haml @@ -10,6 +10,11 @@ = _('Analytics') %ul.sidebar-sub-level-items{ data: { qa_selector: 'analytics_sidebar_submenu' } } + = nav_link(path: navbar_links.first.path, html_options: { class: "fly-out-top-item" } ) do + = link_to navbar_links.first.link do + %strong.fly-out-top-item-name + = _('Analytics') + %li.divider.fly-out-top-item - navbar_links.each do |menu_item| = nav_link(path: menu_item.path) do = link_to(menu_item.link, menu_item.link_to_options) do diff --git a/app/views/projects/forks/new.html.haml b/app/views/projects/forks/new.html.haml index bf03353a565..8a5b08a19c8 100644 --- a/app/views/projects/forks/new.html.haml +++ b/app/views/projects/forks/new.html.haml @@ -19,9 +19,3 @@ %p.prepend-top-default = _("You must have permission to create a project in a namespace before forking.") - .save-project-loader.hide.js-fork-content - %h2.text-center - = icon('spinner spin') - = _("Forking repository") - %p.text-center - = _("Please wait a moment, this page will automatically refresh when ready.") diff --git a/app/views/projects/wikis/_form.html.haml b/app/views/projects/wikis/_form.html.haml index c66799a1598..bc20635f0c5 100644 --- a/app/views/projects/wikis/_form.html.haml +++ b/app/views/projects/wikis/_form.html.haml @@ -12,7 +12,7 @@ .form-group.row .col-sm-12= f.label :title, class: 'control-label-full-width' .col-sm-12 - = f.text_field :title, class: 'form-control qa-wiki-title-textbox', value: @page.title, required: true, autofocus: !@page.persisted?, placeholder: _('Wiki|Page title') + = f.text_field :title, class: 'form-control qa-wiki-title-textbox', value: @page.title, required: true, autofocus: !@page.persisted?, placeholder: s_('Wiki|Page title') %span.d-inline-block.mw-100.prepend-top-5 = icon('lightbulb-o') - if @page.persisted? |