kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

Update no repository placeholder

See merge request gitlab-org/gitlab-ce!17964
This commit is contained in:
Rémy Coutable 2018-03-30 12:25:53 +00:00
parent 80b475d5a0 bb85377976
commit 1246b9c1c5
8 changed files with 129 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/groups/show.html.haml
View File

@ -1,5 +1,5 @@
- @no_container = true
- breadcrumb_title "Details"
- breadcrumb_title _("Details")
- can_create_subgroups = can?(current_user, :create_subgroup, @group)
= content_for :meta_tags do

2
app/views/projects/empty.html.haml
View File

@ -1,5 +1,5 @@
- @no_container = true
- breadcrumb_title "Details"
- breadcrumb_title _("Details")
= render partial: 'flash_messages', locals: { project: @project }

6
app/views/projects/no_repo.html.haml
View File

@ -1,3 +1,5 @@
- breadcrumb_title _("Details")
%h2
%i.fa.fa-warning
#{ _('No repository') }
@ -10,7 +12,7 @@
.no-repo-actions
= 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
@ -19,4 +21,4 @@
- if can? current_user, :remove_project, @project
.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"

2
app/views/projects/show.html.haml
View File

@ -1,5 +1,5 @@
- @no_container = true
- breadcrumb_title "Details"
- breadcrumb_title _("Details")
- @content_class = "limit-container-width" unless fluid_layout
- show_auto_devops_callout = show_auto_devops_callout?(@project)

5
changelogs/unreleased/fix-projects-no-repository-placeholder.yml Normal file
View File

@ -0,0 +1,5 @@
---
title: Update no repository placeholder
merge_request: 17964
author: George Tsiolis
type: fixed

2
features/steps/project/project.rb
View File

@ -143,7 +143,7 @@ class Spinach::Features::Project < Spinach::FeatureSteps
end
step 'I create bare repo' do
click_link 'Create empty bare repository'
click_link 'Create empty repository'
end
step 'I should see command line instructions' do

129
locale/gitlab.pot
View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-12 19:50+0100\n"
"PO-Revision-Date: 2018-03-12 19:50+0100\n"
"POT-Creation-Date: 2018-03-27 14:40+0300\n"
"PO-Revision-Date: 2018-03-27 14:40+0300\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@ -226,6 +226,9 @@ msgstr ""
msgid "All"
msgstr ""
msgid "All changes are committed"
msgstr ""
msgid "All features are enabled for blank projects, from templates, or when importing, but you can disable them afterward in the project settings."
msgstr ""
@ -340,6 +343,9 @@ msgstr ""
msgid "Assign to"
msgstr ""
msgid "Assigned to :name"
msgstr ""
msgid "Assignee"
msgstr ""
@ -417,6 +423,9 @@ msgstr[1] ""
msgid "Branch <strong>%{branch_name}</strong> was created. To set up auto deploy, choose a GitLab CI Yaml template and commit your changes. %{link_to_autodeploy_doc}"
msgstr ""
msgid "Branch has changed"
msgstr ""
msgid "Branch is already taken"
msgstr ""
@ -570,6 +579,9 @@ msgstr ""
msgid "Cancel"
msgstr ""
msgid "Cannot be merged automatically"
msgstr ""
msgid "Cannot modify managed Kubernetes cluster"
msgstr ""
@ -1039,6 +1051,9 @@ msgstr ""
msgid "Commit statistics for %{ref} %{start_time} - %{end_time}"
msgstr ""
msgid "Commit to %{branchName} branch"
msgstr ""
msgid "CommitBoxTitle|Commit"
msgstr ""
@ -1084,6 +1099,9 @@ msgstr ""
msgid "Compare Revisions"
msgstr ""
msgid "Compare changes with the last commit"
msgstr ""
msgid "CompareBranches|%{source_branch} and %{target_branch} are the same."
msgstr ""
@ -1099,6 +1117,9 @@ msgstr ""
msgid "CompareBranches|There isn't anything to compare."
msgstr ""
msgid "Confidential"
msgstr ""
msgid "Confidentiality"
msgstr ""
@ -1195,6 +1216,12 @@ msgstr ""
msgid "Create New Directory"
msgstr ""
msgid "Create a new branch"
msgstr ""
msgid "Create a new branch and merge request"
msgstr ""
msgid "Create a personal access token on your account to pull or push via %{protocol}."
msgstr ""
@ -1204,7 +1231,10 @@ msgstr ""
msgid "Create directory"
msgstr ""
msgid "Create empty bare repository"
msgid "Create empty repository"
msgstr ""
msgid "Create file"
msgstr ""
msgid "Create group label"
@ -1219,6 +1249,15 @@ msgstr ""
msgid "Create merge request and branch"
msgstr ""
msgid "Create new branch"
msgstr ""
msgid "Create new directory"
msgstr ""
msgid "Create new file"
msgstr ""
msgid "Create new label"
msgstr ""
@ -1237,6 +1276,12 @@ msgstr ""
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr ""
msgid "Creates a new branch from %{branchName}"
msgstr ""
msgid "Creates a new branch from %{branchName} and re-directs to create a new merge request"
msgstr ""
msgid "Cron Timezone"
msgstr ""
@ -1311,6 +1356,9 @@ msgstr ""
msgid "Directory name"
msgstr ""
msgid "Discard draft"
msgstr ""
msgid "Dismiss Cycle Analytics introduction box"
msgstr ""
@ -1347,6 +1395,9 @@ msgstr ""
msgid "DownloadSource|Download"
msgstr ""
msgid "Downvotes"
msgstr ""
msgid "Due date"
msgstr ""
@ -1356,6 +1407,12 @@ msgstr ""
msgid "Edit Pipeline Schedule %{id}"
msgstr ""
msgid "Edit files in the editor and commit changes here"
msgstr ""
msgid "Editing"
msgstr ""
msgid "Emails"
msgstr ""
@ -1410,6 +1467,12 @@ msgstr ""
msgid "Environments|You don't have any environments right now."
msgstr ""
msgid "Error checking branch data. Please try again."
msgstr ""
msgid "Error committing changes. Please try again."
msgstr ""
msgid "Error fetching contributors data."
msgstr ""
@ -1497,6 +1560,9 @@ msgstr ""
msgid "Fields on this page are now uneditable, you can configure"
msgstr ""
msgid "File name"
msgstr ""
msgid "Files"
msgstr ""
@ -1628,9 +1694,6 @@ msgstr ""
msgid "GroupsEmptyState|You can manage your group member’s permissions and access to each project in the group."
msgstr ""
msgid "GroupsTree|Are you sure you want to leave the \"${group.fullName}\" group?"
msgstr ""
msgid "GroupsTree|Create a project in this group."
msgstr ""
@ -1676,6 +1739,9 @@ msgstr ""
msgid "HealthCheck|Unhealthy"
msgstr ""
msgid "Help"
msgstr ""
msgid "Hide value"
msgid_plural "Hide values"
msgstr[0] ""
@ -1875,6 +1941,9 @@ msgstr ""
msgid "List your GitHub repositories"
msgstr ""
msgid "Loading the GitLab IDE..."
msgstr ""
msgid "Lock"
msgstr ""
@ -1890,6 +1959,9 @@ msgstr ""
msgid "Login"
msgstr ""
msgid "Manage all notifications"
msgstr ""
msgid "Manage group labels"
msgstr ""
@ -2042,6 +2114,9 @@ msgstr ""
msgid "No assignee"
msgstr ""
msgid "No changes"
msgstr ""
msgid "No connection could be made to a Gitaly Server, please check your logs!"
msgstr ""
@ -2633,6 +2708,9 @@ msgstr ""
msgid "Related Merged Requests"
msgstr ""
msgid "Related merge requests"
msgstr ""
msgid "Remind later"
msgstr ""
@ -2671,6 +2749,12 @@ msgstr ""
msgid "Revert this merge request"
msgstr ""
msgid "Reviewing"
msgstr ""
msgid "Runners"
msgstr ""
msgid "Running"
msgstr ""
@ -2805,21 +2889,12 @@ msgstr ""
msgid "Something went wrong when toggling the button"
msgstr ""
msgid "Something went wrong while closing the %{issuable}. Please try again later"
msgstr ""
msgid "Something went wrong while fetching the projects."
msgstr ""
msgid "Something went wrong while fetching the registry list."
msgstr ""
msgid "Something went wrong while reopening the %{issuable}. Please try again later"
msgstr ""
msgid "Something went wrong while resolving this discussion. Please try again."
msgstr ""
msgid "Something went wrong. Please try again."
msgstr ""
@ -3044,6 +3119,9 @@ msgstr ""
msgid "Target Branch"
msgstr ""
msgid "Target branch"
msgstr ""
msgid "Team"
msgstr ""
@ -3435,6 +3513,9 @@ msgstr ""
msgid "UploadLink|click to upload"
msgstr ""
msgid "Upvotes"
msgstr ""
msgid "Use the following registration token during setup:"
msgstr ""
@ -3444,6 +3525,9 @@ msgstr ""
msgid "Variables are applied to environments via the runner. They can be protected by only exposing them to protected branches or tags. You can use variables for passwords, secret keys, or whatever you want."
msgstr ""
msgid "View and edit lines"
msgstr ""
msgid "View file @ "
msgstr ""
@ -3486,6 +3570,9 @@ msgstr ""
msgid "We want to be sure it is you, please confirm you are not a robot."
msgstr ""
msgid "Web IDE"
msgstr ""
msgid "Wiki"
msgstr ""
@ -3597,6 +3684,9 @@ msgstr ""
msgid "Withdraw Access Request"
msgstr ""
msgid "Write a commit message..."
msgstr ""
msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
msgstr ""
@ -3669,12 +3759,18 @@ msgstr ""
msgid "You'll need to use different branch names to get a valid comparison."
msgstr ""
msgid "You're receiving this email because of your account on %{host}. %{manage_notifications_link} &middot; %{help_link}"
msgstr ""
msgid "Your Kubernetes cluster information on this page is still editable, but you are advised to disable and reconfigure"
msgstr ""
msgid "Your changes can be committed to %{branch_name} because a merge request is open."
msgstr ""
msgid "Your changes have been committed. Commit %{commitId} %{commitStats}"
msgstr ""
msgid "Your comment will not be visible to the public."
msgstr ""
@ -3902,3 +3998,6 @@ msgstr ""
msgid "uses Kubernetes clusters to deploy your code!"
msgstr ""
msgid "with %{additions} additions, %{deletions} deletions."
msgstr ""

4
spec/features/profiles/account_spec.rb
View File

@ -43,14 +43,14 @@ feature 'Profile > Account' do
update_username(new_username)
visit 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
scenario 'the old project path redirects to the new path' do
update_username(new_username)
visit old_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