Commit 3453c6a6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'ee-fix/projects-no-repository-placeholder' into 'master'

Update no repository placeholder

See merge request gitlab-org/gitlab-ee!5149
parents 52611633 c863e550
- @no_container = true - @no_container = true
- breadcrumb_title "Details" - breadcrumb_title _("Details")
- can_create_subgroups = can?(current_user, :create_subgroup, @group) - can_create_subgroups = can?(current_user, :create_subgroup, @group)
= content_for :meta_tags do = content_for :meta_tags do
......
- @no_container = true - @no_container = true
- breadcrumb_title "Details" - breadcrumb_title _("Details")
= render partial: 'flash_messages', locals: { project: @project } = render partial: 'flash_messages', locals: { project: @project }
......
- breadcrumb_title _("Details")
%h2 %h2
%i.fa.fa-warning %i.fa.fa-warning
#{ _('No repository') } #{ _('No repository') }
...@@ -10,7 +12,7 @@ ...@@ -10,7 +12,7 @@
.no-repo-actions .no-repo-actions
= link_to project_repository_path(@project), method: :post, class: 'btn btn-primary' do = link_to project_repository_path(@project), method: :post, class: 'btn btn-primary' do
#{ _('Create empty bare repository') } #{ _('Create empty repository') }
%strong.prepend-left-10.append-right-10 or %strong.prepend-left-10.append-right-10 or
...@@ -19,4 +21,4 @@ ...@@ -19,4 +21,4 @@
- if can? current_user, :remove_project, @project - if can? current_user, :remove_project, @project
.prepend-top-20 .prepend-top-20
= link_to _('Remove project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right" = link_to _('Remove project'), project_path(@project), data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-inverted btn-remove pull-right"
- @no_container = true - @no_container = true
- breadcrumb_title "Details" - breadcrumb_title _("Details")
- @content_class = "limit-container-width" unless fluid_layout - @content_class = "limit-container-width" unless fluid_layout
- show_auto_devops_callout = show_auto_devops_callout?(@project) - show_auto_devops_callout = show_auto_devops_callout?(@project)
......
---
title: Update no repository placeholder
merge_request: 17964
author: George Tsiolis
type: fixed
...@@ -166,7 +166,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps ...@@ -166,7 +166,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end end
step 'I create bare repo' do step 'I create bare repo' do
click_link 'Create empty bare repository' click_link 'Create empty repository'
end end
step 'I should see command line instructions' do step 'I should see command line instructions' do
......
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-26 15:11+0200\n" "POT-Creation-Date: 2018-03-27 14:40+0300\n"
"PO-Revision-Date: 2018-03-26 15:11+0200\n" "PO-Revision-Date: 2018-03-27 14:40+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -1411,7 +1411,10 @@ msgstr "" ...@@ -1411,7 +1411,10 @@ msgstr ""
msgid "Create directory" msgid "Create directory"
msgstr "" msgstr ""
msgid "Create empty bare repository" msgid "Create empty repository"
msgstr ""
msgid "Create file"
msgstr "" msgstr ""
msgid "Create epic" msgid "Create epic"
...@@ -1946,6 +1949,9 @@ msgstr "" ...@@ -1946,6 +1949,9 @@ msgstr ""
msgid "GeoNodes|Replication slots:" msgid "GeoNodes|Replication slots:"
msgstr "" msgstr ""
msgid "GroupsTree|Create a project in this group."
msgstr ""
msgid "GeoNodes|Repositories checksummed:" msgid "GeoNodes|Repositories checksummed:"
msgstr "" msgstr ""
...@@ -1991,6 +1997,14 @@ msgstr "" ...@@ -1991,6 +1997,14 @@ msgstr ""
msgid "GeoNodes|Wiki checksums verified:" msgid "GeoNodes|Wiki checksums verified:"
msgstr "" msgstr ""
msgid "Help"
msgstr ""
msgid "Hide value"
msgid_plural "Hide values"
msgstr[0] ""
msgstr[1] ""
msgid "GeoNodes|Wikis checksummed:" msgid "GeoNodes|Wikis checksummed:"
msgstr "" msgstr ""
...@@ -3569,9 +3583,6 @@ msgstr "" ...@@ -3569,9 +3583,6 @@ msgstr ""
msgid "Something went wrong on our end" msgid "Something went wrong on our end"
msgstr "" msgstr ""
msgid "Something went wrong on our end."
msgstr ""
msgid "Something went wrong trying to change the confidentiality of this issue" msgid "Something went wrong trying to change the confidentiality of this issue"
msgstr "" msgstr ""
...@@ -3584,6 +3595,9 @@ msgstr "" ...@@ -3584,6 +3595,9 @@ msgstr ""
msgid "Something went wrong while fetching Dependency Scanning." msgid "Something went wrong while fetching Dependency Scanning."
msgstr "" msgstr ""
msgid "Something went wrong while fetching the projects."
msgstr ""
msgid "Something went wrong while fetching SAST." msgid "Something went wrong while fetching SAST."
msgstr "" msgstr ""
......
...@@ -43,14 +43,14 @@ feature 'Profile > Account' do ...@@ -43,14 +43,14 @@ feature 'Profile > Account' do
update_username(new_username) update_username(new_username)
visit new_project_path visit new_project_path
expect(current_path).to eq(new_project_path) expect(current_path).to eq(new_project_path)
expect(find('.breadcrumbs-sub-title')).to have_content(project.path) expect(find('.breadcrumbs-sub-title')).to have_content('Details')
end end
scenario 'the old project path redirects to the new path' do scenario 'the old project path redirects to the new path' do
update_username(new_username) update_username(new_username)
visit old_project_path visit old_project_path
expect(current_path).to eq(new_project_path) expect(current_path).to eq(new_project_path)
expect(find('.breadcrumbs-sub-title')).to have_content(project.path) expect(find('.breadcrumbs-sub-title')).to have_content('Details')
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment