diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 15:12:11 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-21 15:12:11 +0000 |
commit | 9ef26edc4ae561ba072dee3900fef4408e227b48 (patch) | |
tree | e1e0b5c575b2f39d615d6d2507663dcdf22ce22a /app/views | |
parent | 82f4de60b7943e9c4a1311efcf29ee42dc38742e (diff) | |
download | gitlab-ce-9ef26edc4ae561ba072dee3900fef4408e227b48.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/import/_githubish_status.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/bitbucket_server/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/fogbugz/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/fogbugz/new_user_map.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/gitea/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/github/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/gitlab_projects/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/manifest/new.html.haml | 2 | ||||
-rw-r--r-- | app/views/import/phabricator/new.html.haml | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/app/views/import/_githubish_status.html.haml b/app/views/import/_githubish_status.html.haml index 02a8f3142c6..8f18d68fd55 100644 --- a/app/views/import/_githubish_status.html.haml +++ b/app/views/import/_githubish_status.html.haml @@ -6,7 +6,7 @@ - provider_title = Gitlab::ImportSources.title(provider) - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') #import-projects-mount-element{ data: { provider: provider, provider_title: provider_title, can_select_namespace: current_user.can_select_namespace?.to_s, diff --git a/app/views/import/bitbucket_server/new.html.haml b/app/views/import/bitbucket_server/new.html.haml index ce6bdd7a2fb..721447186a6 100644 --- a/app/views/import/bitbucket_server/new.html.haml +++ b/app/views/import/bitbucket_server/new.html.haml @@ -1,6 +1,6 @@ - page_title _('Bitbucket Server Import') - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title.d-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center diff --git a/app/views/import/fogbugz/new.html.haml b/app/views/import/fogbugz/new.html.haml index 51156797270..d716d08529c 100644 --- a/app/views/import/fogbugz/new.html.haml +++ b/app/views/import/fogbugz/new.html.haml @@ -1,6 +1,6 @@ - page_title _("FogBugz Import") - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title.d-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center diff --git a/app/views/import/fogbugz/new_user_map.html.haml b/app/views/import/fogbugz/new_user_map.html.haml index 4281d77e833..93572e14a65 100644 --- a/app/views/import/fogbugz/new_user_map.html.haml +++ b/app/views/import/fogbugz/new_user_map.html.haml @@ -1,6 +1,6 @@ - page_title _('User map'), _('FogBugz import') - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title.d-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center diff --git a/app/views/import/gitea/new.html.haml b/app/views/import/gitea/new.html.haml index 288ae5f1cec..de717ce87eb 100644 --- a/app/views/import/gitea/new.html.haml +++ b/app/views/import/gitea/new.html.haml @@ -1,6 +1,6 @@ - page_title _("Gitea Import") - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title = custom_icon('gitea_logo') diff --git a/app/views/import/github/new.html.haml b/app/views/import/github/new.html.haml index 3407f9202bf..3f7f929f766 100644 --- a/app/views/import/github/new.html.haml +++ b/app/views/import/github/new.html.haml @@ -1,7 +1,7 @@ - title = _('Authenticate with GitHub') - page_title title - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title = title diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml index 028268482cd..533d0d13be3 100644 --- a/app/views/import/gitlab_projects/new.html.haml +++ b/app/views/import/gitlab_projects/new.html.haml @@ -1,6 +1,6 @@ - page_title _("GitLab Import") - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title.d-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center diff --git a/app/views/import/manifest/new.html.haml b/app/views/import/manifest/new.html.haml index bfaff3bb300..a949e14e273 100644 --- a/app/views/import/manifest/new.html.haml +++ b/app/views/import/manifest/new.html.haml @@ -1,6 +1,6 @@ - page_title _("Manifest file import") - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title diff --git a/app/views/import/phabricator/new.html.haml b/app/views/import/phabricator/new.html.haml index 9596fdb615a..0249dc446e4 100644 --- a/app/views/import/phabricator/new.html.haml +++ b/app/views/import/phabricator/new.html.haml @@ -1,6 +1,6 @@ - page_title _('Phabricator Server Import') - header_title _("New project"), new_project_path -- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project') +- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_project_path(anchor: 'import_project') %h3.page-title.d-flex .gl-display-flex.gl-align-items-center.gl-justify-content-center |