diff --git a/app/assets/stylesheets/sections/commits.scss b/app/assets/stylesheets/sections/commits.scss index 0df39298c89768116290234f073f1ef53ae87b2d..1e564188892cfa0ae23b59474fe34cea8ea174da 100644 --- a/app/assets/stylesheets/sections/commits.scss +++ b/app/assets/stylesheets/sections/commits.scss @@ -413,3 +413,9 @@ padding: 4px; background-color: #EEE; } + +.commit-description { + background: none; + border: none; + margin: 0; +} diff --git a/app/views/blame/_head.html.haml b/app/views/blame/_head.html.haml index ef9e6c9c53288280e7147b2f57b419ef3f150046..3a8838295621fb993c7d291deb7cf8daa4c585ca 100644 --- a/app/views/blame/_head.html.haml +++ b/app/views/blame/_head.html.haml @@ -1,7 +1,2 @@ -%ul.nav.nav-tabs - %li - = render partial: 'shared/ref_switcher', locals: {destination: 'tree', path: params[:path]} - = nav_link(controller: :refs) do - = link_to 'Source', project_tree_path(@project, @ref) - %li.pull-right - = render "shared/clone_panel" +%div.tree-ref-holder + = render 'shared/ref_switcher', destination: 'tree', path: params[:path] diff --git a/app/views/blame/show.html.haml b/app/views/blame/show.html.haml index 36d81e6af38767b2748ab7d779068caa7f6c0b00..b2a45ef5303300d962cfc98cbffca9019dda3f5e 100644 --- a/app/views/blame/show.html.haml +++ b/app/views/blame/show.html.haml @@ -3,7 +3,7 @@ #tree-holder.tree-holder %ul.breadcrumb %li - %span.arrow + %i.icon-angle-right = link_to project_tree_path(@project, @ref) do = @project.name - @tree.breadcrumbs(6) do |link| @@ -39,8 +39,10 @@ - else - lines.each do |line| = current_line + \ - current_line += 1 %td.lines %pre - lines.each do |line| = line + \ diff --git a/doc/install/installation.md b/doc/install/installation.md index 69d3b186b3201a459a2d2b5b7f6d04bd277a6e1f..67a5a52f22eb3dbb17eaf29f18e8efc336d85a1d 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -91,7 +91,6 @@ Create a `git` user for Gitlab: sudo adduser --disabled-login --gecos 'GitLab' git - # 4. GitLab shell GitLab Shell is a ssh access and repository management software developed specially for GitLab. @@ -167,6 +166,10 @@ do so with caution! # Copy the example Unicorn config sudo -u git -H cp config/unicorn.rb.example config/unicorn.rb + + # Set username and email for the git user + sudo -u git -H git config --global user.name "GitLab" + sudo -u git -H git config --global user.email "gitlab@your-domain.com" **Important Note:** Make sure to edit both files to match your setup.