Download as
Browse Code »

Commit 6a58deb53630de59fc05d2dacd272463901c42d8

Authored by randx
1 parent ad3f4922
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

UI changes: 

* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
Showing 26 changed files with 114 additions and 61 deletions   Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
  Diff comments   View file @6a58deb
@@ -281,6 +281,7 @@ table.no-borders { @@ -281,6 +281,7 @@ table.no-borders {
281 font-size:13px; 281 font-size:13px;
282 background: #474D57; 282 background: #474D57;
283 color:#fff; 283 color:#fff;
  284 + font-weight:bold;
284 font-family: monospace; 285 font-family: monospace;
285 } 286 }
286 } 287 }
@@ -590,3 +591,27 @@ ul.breadcrumb { @@ -590,3 +591,27 @@ ul.breadcrumb {
590 border-top:1px solid #eee; 591 border-top:1px solid #eee;
591 } 592 }
592 } 593 }
  594 +
  595 +input[type=text] {
  596 + &.large_text {
  597 + padding:6px;
  598 + font-size:16px;
  599 + }
  600 +}
  601 +
  602 +p {
  603 + &.slead {
  604 + color:#456;
  605 + font-size:16px;
  606 + margin-bottom: 12px;
  607 + font-weight: 200;
  608 + line-height: 24px;
  609 + }
  610 +}
  611 +
  612 +h3.page_title {
  613 + color:#456;
  614 + font-size:20px;
  615 + font-weight: 600;
  616 + line-height: 28px;
  617 +}
app/views/commits/_commit_box.html.haml
  Diff comments   View file @6a58deb
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 %i.icon-download-alt 12 %i.icon-download-alt
13 Get Patch 13 Get Patch
14   14  
15 - %h3.commit-title 15 + %h3.commit-title.page_title
16 = commit_msg_with_link_to_issues(@project, @commit.title) 16 = commit_msg_with_link_to_issues(@project, @commit.title)
17 - if @commit.description.present? 17 - if @commit.description.present?
18 %pre.commit-description 18 %pre.commit-description
app/views/dashboard/issues.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Issues 2 Issues
3 %small (assigned to you) 3 %small (assigned to you)
4 %small.right #{@issues.total_count} issues 4 %small.right #{@issues.total_count} issues
5 5
  6 +%br
6 .clearfix 7 .clearfix
7 - if @issues.any? 8 - if @issues.any?
8 - @issues.group_by(&:project).each do |group| 9 - @issues.group_by(&:project).each do |group|
app/views/dashboard/merge_requests.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Merge Requests 2 Merge Requests
3 %small (authored or assigned to you) 3 %small (authored or assigned to you)
4 %small.right #{@merge_requests.total_count} merge requests 4 %small.right #{@merge_requests.total_count} merge requests
app/views/help/index.html.haml
  Diff comments   View file @6a58deb
1 -%h3.cgray 1 +%h3.page_title
2 GITLAB 2 GITLAB
3 - %span.right v2.6 3 + .right
  4 + %span= Gitlab::Version
  5 + %small= Gitlab::Revision
4 %hr 6 %hr
5 -%h4 Self Hosted Git Management  
6 -%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. 7 +%p.lead
  8 + Self Hosted Git Management
  9 + %br
  10 + Fast, secure and stable solution based on Ruby on Rails & Gitolite.
7 11
8 %hr 12 %hr
9 13
@@ -15,3 +19,6 @@ @@ -15,3 +19,6 @@
15 19
16 %li 20 %li
17 %h5= link_to "Permissions", help_permissions_path 21 %h5= link_to "Permissions", help_permissions_path
  22 +
  23 + %li
  24 + %h5= link_to "Web Hooks", help_web_hooks_path
app/views/help/permissions.html.haml
  Diff comments   View file @6a58deb
1 %h3 Permissions 1 %h3 Permissions
  2 +.back_link
  3 + = link_to help_path do
  4 + ← to index
2 %hr 5 %hr
3 6
4 .row 7 .row
app/views/help/web_hooks.html.haml
  Diff comments   View file @6a58deb
1 %h3 Web hooks 1 %h3 Web hooks
2 -%br 2 +.back_link
  3 + = link_to help_path do
  4 + ← to index
  5 +%hr
3 6
4 -%p Application will send POST request with some data like example below: 7 +%p.slead
  8 + Every Gitlab project can trigger a web server whenever the repo is pushed to.
  9 + %br
  10 + Web Hooks can be used to update an external issue tracker, trigger CI builds, update a backup mirror, or even deploy to your production server.
  11 + %br
  12 + GITLAB will send POST request with commits information on every push.
5 %h5 Hooks request example: 13 %h5 Hooks request example:
6 = render "hooks/data_ex" 14 = render "hooks/data_ex"
7 15
app/views/help/workflow.html.haml
  Diff comments   View file @6a58deb
1 - bash_lexer = Pygments::Lexer[:bash] 1 - bash_lexer = Pygments::Lexer[:bash]
2 %h3 Workflow 2 %h3 Workflow
  3 +.back_link
  4 + = link_to help_path do
  5 + ← to index
3 %hr 6 %hr
4 7
5 %ol.help 8 %ol.help
app/views/hooks/_data_ex.html.erb
  Diff comments   View file @6a58deb
@@ -36,7 +36,8 @@ @@ -36,7 +36,8 @@
36 :email => "gitlabdev@dv6700.(none)" 36 :email => "gitlabdev@dv6700.(none)"
37 } 37 }
38 } 38 }
39 - ] 39 + ],
  40 + total_commits_count => 3
40 } 41 }
41 eos 42 eos
42 %> 43 %>
app/views/issues/index.html.haml
  Diff comments   View file @6a58deb
1 = render "issues/head" 1 = render "issues/head"
2 .issues_content 2 .issues_content
3 - %h3 3 + %h3.page_title
4 Issues 4 Issues
5 %small (#{@issues.total_count}) 5 %small (#{@issues.total_count})
6 .right 6 .right
app/views/issues/show.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Issue ##{@issue.id} 2 Issue ##{@issue.id}
3 3
4 %small 4 %small
app/views/keys/index.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 SSH Keys 2 SSH Keys
3 = link_to "Add new", new_key_path, :class => "btn small right" 3 = link_to "Add new", new_key_path, :class => "btn small right"
4 4
5 -%br 5 +%hr
  6 +%p.slead
  7 + SSH key allows you to establish a secure connection between your computer and Gitlab
  8 +
6 9
7 %table#keys-table.admin-table 10 %table#keys-table.admin-table
8 %thead 11 %thead
app/views/keys/show.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Public key: 2 Public key:
3 = @key.title 3 = @key.title
4 %small 4 %small
app/views/merge_requests/index.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Merge Requests 2 Merge Requests
3 - if can? current_user, :write_issue, @project 3 - if can? current_user, :write_issue, @project
4 = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do 4 = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
app/views/merge_requests/show/_mr_title.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 = "Merge Request ##{@merge_request.id}:" 2 = "Merge Request ##{@merge_request.id}:"
3   3  
4 %span.pretty_label.branch= @merge_request.source_branch 4 %span.pretty_label.branch= @merge_request.source_branch
app/views/milestones/index.html.haml
  Diff comments   View file @6a58deb
1 = render "issues/head" 1 = render "issues/head"
2 .milestones_content 2 .milestones_content
3 - %h3 3 + %h3.page_title
4 Milestones 4 Milestones
5 - if can? current_user, :admin_milestone, @project 5 - if can? current_user, :admin_milestone, @project
6 = link_to "New Milestone", new_project_milestone_path(@project), :class => "right btn small", :title => "New Milestone" 6 = link_to "New Milestone", new_project_milestone_path(@project), :class => "right btn small", :title => "New Milestone"
app/views/profile/password.html.haml
  Diff comments   View file @6a58deb
1 -%h3 Password 1 +%h3.page_title Password
2 %hr 2 %hr
3 = form_for @user, :url => profile_password_path, :method => :put do |f| 3 = form_for @user, :url => profile_password_path, :method => :put do |f|
4 .data 4 .data
5 - .alert.alert-info  
6 - %span After successful password update you will be redirected to login page where you should login with new password 5 + %p.slead After successful password update you will be redirected to login page where you should login with new password
7 -if @user.errors.any? 6 -if @user.errors.any?
8 .alert-message.block-message.error 7 .alert-message.block-message.error
9 %ul 8 %ul
app/views/profile/show.html.haml
  Diff comments   View file @6a58deb
1 .profile_avatar_holder 1 .profile_avatar_holder
2 = image_tag gravatar_icon(@user.email, 90), :class => "styled_image" 2 = image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
3 -%h3 3 +%h3.page_title
4 = @user.name 4 = @user.name
5 %br 5 %br
6 %small 6 %small
app/views/profile/token.html.haml
  Diff comments   View file @6a58deb
1 -%h3 1 +%h3.page_title
2 Private token 2 Private token
3 %span.cred.right 3 %span.cred.right
4 keep it in secret! 4 keep it in secret!
5 %hr 5 %hr
6 = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f| 6 = form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
7 .data 7 .data
8 - .alert.alert-info  
9 - %p Private token used to access application resources without authentication.  
10 - %p * required for rss feed 8 + %p.slead
  9 + Private token used to access application resources without authentication.
  10 + %br
  11 + It can be used for atom feed or API
11 %p.cgray 12 %p.cgray
12 - if current_user.private_token 13 - if current_user.private_token
13 - = text_field_tag "token", current_user.private_token 14 + = text_field_tag "token", current_user.private_token, :class => "xxlarge large_text"
14 - else 15 - else
15 You don`t have one yet. Click generate to fix it. 16 You don`t have one yet. Click generate to fix it.
16 .actions 17 .actions
app/views/projects/graph.html.haml
  Diff comments   View file @6a58deb
1 -%h3 Project Network Graph 1 +%h3.page_title Project Network Graph
2 %br 2 %br
3 .graph_holder 3 .graph_holder
4 %h4 4 %h4
app/views/projects/team.html.haml
  Diff comments   View file @6a58deb
1 = render "project_head" 1 = render "project_head"
2 -%h3 2 +%h3.page_title
3 Team Members 3 Team Members
4 %small (#{@project.users_projects.count}) 4 %small (#{@project.users_projects.count})
5 5
6 - if can? current_user, :admin_team_member, @project 6 - if can? current_user, :admin_team_member, @project
7 - .alert.alert-info 7 + %p.slead
8 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do 8 = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
9 New Team Member 9 New Team Member
10 Read more about project permissions 10 Read more about project permissions
11 %strong= link_to "here", help_permissions_path, :class => "vlink" 11 %strong= link_to "here", help_permissions_path, :class => "vlink"
12 - %br  
13 - To open team member profile - click on avatar.  
14 12
15 13
16 = render :partial => "team", :locals => {:project => @project} 14 = render :partial => "team", :locals => {:project => @project}
config/initializers/gitlab/10_app.rb 0 → 100644
  Diff comments   View file @6a58deb
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +module Gitlab
  2 + Version = File.read(Rails.root.join("VERSION"))
  3 + Revision = `git log --pretty=format:'%h' -n 1`
  4 +end
config/initializers/gitlab/20_grit_ext.rb 0 → 100644
  Diff comments   View file @6a58deb
@@ -0,0 +1,28 @@ @@ -0,0 +1,28 @@
  1 +require 'grit'
  2 +require 'pygments'
  3 +
  4 +Grit::Git.git_timeout = GIT_OPTS["git_timeout"]
  5 +Grit::Git.git_max_size = GIT_OPTS["git_max_size"]
  6 +
  7 +Grit::Blob.class_eval do
  8 + include Linguist::BlobHelper
  9 +
  10 + def data
  11 + @data ||= @repo.git.cat_file({:p => true}, id)
  12 + Gitlab::Encode.utf8 @data
  13 + end
  14 +end
  15 +
  16 +Grit::Diff.class_eval do
  17 + def old_path
  18 + Gitlab::Encode.utf8 @a_path
  19 + end
  20 +
  21 + def new_path
  22 + Gitlab::Encode.utf8 @b_path
  23 + end
  24 +
  25 + def diff
  26 + Gitlab::Encode.utf8 @diff
  27 + end
  28 +end
config/initializers/gitlab/30_resque_queues.rb 0 → 100644
  Diff comments   View file @6a58deb
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
config/initializers/gitlabhq/20_grit_ext.rb
View file @ad3f492
@@ -1,28 +0,0 @@ @@ -1,28 +0,0 @@
1 -require 'grit'  
2 -require 'pygments'  
3 -  
4 -Grit::Git.git_timeout = GIT_OPTS["git_timeout"]  
5 -Grit::Git.git_max_size = GIT_OPTS["git_max_size"]  
6 -  
7 -Grit::Blob.class_eval do  
8 - include Linguist::BlobHelper  
9 -  
10 - def data  
11 - @data ||= @repo.git.cat_file({:p => true}, id)  
12 - Gitlab::Encode.utf8 @data  
13 - end  
14 -end  
15 -  
16 -Grit::Diff.class_eval do  
17 - def old_path  
18 - Gitlab::Encode.utf8 @a_path  
19 - end  
20 -  
21 - def new_path  
22 - Gitlab::Encode.utf8 @b_path  
23 - end  
24 -  
25 - def diff  
26 - Gitlab::Encode.utf8 @diff  
27 - end  
28 -end  
config/initializers/gitlabhq/30_resque_queues.rb
View file @ad3f492
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -Resque.watch_queue(PostReceive.instance_variable_get("@queue"))