Commit 6a81e51c authored by Valery Sizov's avatar Valery Sizov Committed by Robert Speicher

Merge branch 'fix-issue-3094' into 'master'

Don't show "Add README" link in an empty repository if user doesn't have access to push

Reporter users would see this before even though they didn't have access to push:

![image](/uploads/1dd328ab7e58cd00c5b696f079816e16/image.png)

It's not complete accurate to include the push command-line instructions, but users may still want the instructions to clone. After:

![image](/uploads/3d214e140916d2f174d0b5fec0ac472d/image.png)

Closes #3094

See merge request !1626
parent 843070b4
...@@ -8,6 +8,7 @@ v 8.1.0 (unreleased) ...@@ -8,6 +8,7 @@ v 8.1.0 (unreleased)
- Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge. - Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.
- Fix duplicate repositories in GitHub import page (Stan Hu) - Fix duplicate repositories in GitHub import page (Stan Hu)
- Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu) - Fix nonatomic database update potentially causing project star counts to go negative (Stan Hu)
- Don't show "Add README" link in an empty repository if user doesn't have access to push (Stan Hu)
- Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu) - Fix error preventing displaying of commit data for a directory with a leading dot (Stan Hu)
- Speed up load times of issue detail pages by roughly 1.5x - Speed up load times of issue detail pages by roughly 1.5x
- If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg) - If a merge request is to close an issue, show this on the issue page (Zeger-Jan van de Weg)
......
...@@ -2,53 +2,56 @@ ...@@ -2,53 +2,56 @@
- if current_user && can?(current_user, :download_code, @project) - if current_user && can?(current_user, :download_code, @project)
= render 'shared/no_ssh' = render 'shared/no_ssh'
= render 'shared/no_password' = render 'shared/no_password'
= render "home_panel" = render "home_panel"
.gray-content-block.center .gray-content-block.center
%h3.page-title %h3.page-title
The repository for this project is empty The repository for this project is empty
%p - if can?(current_user, :download_code, @project)
If you already have files you can push them using command line instructions below. %p
%br If you already have files you can push them using command line instructions below.
Otherwise you can start with %br
= link_to "adding README", new_readme_path, class: 'underlined-link' - if can?(current_user, :push_code, @project)
file to this project. Otherwise you can start with
= link_to "adding README", new_readme_path, class: 'underlined-link'
file to this project.
.prepend-top-20 - if can?(current_user, :download_code, @project)
.empty_wrapper .prepend-top-20
%h3.page-title-empty .empty_wrapper
Command line instructions %h3.page-title-empty
%div.git-empty Command line instructions
%fieldset %div.git-empty
%h5 Git global setup %fieldset
%pre.light-well %h5 Git global setup
:preserve %pre.light-well
git config --global user.name "#{h git_user_name}" :preserve
git config --global user.email "#{h git_user_email}" git config --global user.name "#{h git_user_name}"
git config --global user.email "#{h git_user_email}"
%fieldset %fieldset
%h5 Create a new repository %h5 Create a new repository
%pre.light-well %pre.light-well
:preserve :preserve
git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')} git clone #{ content_tag(:span, default_url_to_repo, class: 'clone')}
cd #{h @project.path} cd #{h @project.path}
touch README.md touch README.md
git add README.md git add README.md
git commit -m "add README" git commit -m "add README"
git push -u origin master git push -u origin master
%fieldset %fieldset
%h5 Existing folder or Git repository %h5 Existing folder or Git repository
%pre.light-well %pre.light-well
:preserve :preserve
cd existing_folder cd existing_folder
git init git init
git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')} git remote add origin #{ content_tag(:span, default_url_to_repo, class: 'clone')}
git add . git add .
git commit git commit
git push -u origin master git push -u origin master
- 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.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right" = link_to 'Remove project', [@project.namespace.becomes(Namespace), @project], data: { confirm: remove_project_message(@project)}, method: :delete, class: "btn btn-remove pull-right"
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