Commit 0192903b authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fixes-new-layout' into 'master'

Fixes new layout

* fix empty project page
* fix commit -> builds page missing margin

See merge request !2440
parents 2f2aada3 cd2ddaaa
- page_title "Builds", "#{@commit.title} (#{@commit.short_id})", "Commits" - page_title "Builds", "#{@commit.title} (#{@commit.short_id})", "Commits"
= render "projects/commits/header_title" = render "projects/commits/header_title"
= render "commit_box" .prepend-top-default
= render "commit_box"
= render "ci_menu" = render "ci_menu"
= render "builds" = render "builds"
- @no_container = true
= content_for :flash_message do = content_for :flash_message do
- 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'
...@@ -17,40 +19,41 @@ ...@@ -17,40 +19,41 @@
file to this project. file to this project.
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
.prepend-top-20 %div{ class: container_class }
.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