diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 21:08:37 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 21:08:37 +0000 |
| commit | bbaf2bb0438b1c71020d9d216feb528add225a7f (patch) | |
| tree | 47409ddbb4994ec78c24503416ab44f129f39ec6 /app/views | |
| parent | e9c2bf267862e22c0770cc7b3a1ed97a8b87a7fd (diff) | |
| download | gitlab-ce-bbaf2bb0438b1c71020d9d216feb528add225a7f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/_activity.html.haml | 3 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_with_tabs.html.haml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 12da62f4c64..07faf5a66da 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -6,4 +6,5 @@ = icon('rss') .content_list.project-activity{ :"data-href" => activity_project_path(@project) } - = spinner + .loading + .spinner.spinner-md diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 1c18487f688..3c6fb5b19a4 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -124,7 +124,7 @@ .save-project-loader.hide .center %h2 - %i.fa.fa-spinner.fa-spin + .spinner.spinner-md.align-text-bottom = _('Saving project.') %p= _('Please wait a moment, this page will automatically refresh when ready.') diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index fabe636b05c..3ff4ab354b9 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -75,7 +75,7 @@ .save-project-loader.d-none .center %h2 - %i.fa.fa-spinner.fa-spin + .spinner.spinner-md.align-text-bottom = s_('ProjectsNew|Creating project & repository.') %p = s_('ProjectsNew|Please wait a moment, this page will automatically refresh when ready.') diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml index cdd75d43a78..37ca020cfb6 100644 --- a/app/views/projects/pipelines/_with_tabs.html.haml +++ b/app/views/projects/pipelines/_with_tabs.html.haml @@ -3,7 +3,7 @@ .tabs-holder %ul.pipelines-tabs.nav-links.no-top.no-bottom.mobile-separator.nav.nav-tabs %li.js-pipeline-tab-link - = link_to @pipeline_path, data: { target: '#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do + = link_to project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-pipeline', action: 'pipelines', toggle: 'tab' }, class: 'pipeline-tab' do = _('Pipeline') %li.js-builds-tab-link = link_to builds_project_pipeline_path(@project, @pipeline), data: { target: '#js-tab-builds', action: 'builds', toggle: 'tab' }, class: 'builds-tab' do |