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
This commit is contained in:
randx
parent
ad3f4922ee
commit
6a58deb536
|
|
@ -281,6 +281,7 @@ table.no-borders {
|
|||
font-size:13px;
|
||||
background: #474D57;
|
||||
color:#fff;
|
||||
font-weight:bold;
|
||||
font-family: monospace;
|
||||
}
|
||||
}
|
||||
|
|
@ -590,3 +591,27 @@ ul.breadcrumb {
|
|||
border-top:1px solid #eee;
|
||||
}
|
||||
}
|
||||
|
||||
input[type=text] {
|
||||
&.large_text {
|
||||
padding:6px;
|
||||
font-size:16px;
|
||||
}
|
||||
}
|
||||
|
||||
p {
|
||||
&.slead {
|
||||
color:#456;
|
||||
font-size:16px;
|
||||
margin-bottom: 12px;
|
||||
font-weight: 200;
|
||||
line-height: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
h3.page_title {
|
||||
color:#456;
|
||||
font-size:20px;
|
||||
font-weight: 600;
|
||||
line-height: 28px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
%i.icon-download-alt
|
||||
Get Patch
|
||||
|
||||
%h3.commit-title
|
||||
%h3.commit-title.page_title
|
||||
= commit_msg_with_link_to_issues(@project, @commit.title)
|
||||
- if @commit.description.present?
|
||||
%pre.commit-description
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Issues
|
||||
%small (assigned to you)
|
||||
%small.right #{@issues.total_count} issues
|
||||
|
||||
%br
|
||||
.clearfix
|
||||
- if @issues.any?
|
||||
- @issues.group_by(&:project).each do |group|
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Merge Requests
|
||||
%small (authored or assigned to you)
|
||||
%small.right #{@merge_requests.total_count} merge requests
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
%h3.cgray
|
||||
%h3.page_title
|
||||
GITLAB
|
||||
%span.right v2.6
|
||||
.right
|
||||
%span= Gitlab::Version
|
||||
%small= Gitlab::Revision
|
||||
%hr
|
||||
%h4 Self Hosted Git Management
|
||||
%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
|
||||
%p.lead
|
||||
Self Hosted Git Management
|
||||
%br
|
||||
Fast, secure and stable solution based on Ruby on Rails & Gitolite.
|
||||
|
||||
%hr
|
||||
|
||||
|
|
@ -15,3 +19,6 @@
|
|||
|
||||
%li
|
||||
%h5= link_to "Permissions", help_permissions_path
|
||||
|
||||
%li
|
||||
%h5= link_to "Web Hooks", help_web_hooks_path
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
%h3 Permissions
|
||||
.back_link
|
||||
= link_to help_path do
|
||||
← to index
|
||||
%hr
|
||||
|
||||
.row
|
||||
|
|
|
|||
|
|
@ -1,7 +1,15 @@
|
|||
%h3 Web hooks
|
||||
%br
|
||||
.back_link
|
||||
= link_to help_path do
|
||||
← to index
|
||||
%hr
|
||||
|
||||
%p Application will send POST request with some data like example below:
|
||||
%p.slead
|
||||
Every Gitlab project can trigger a web server whenever the repo is pushed to.
|
||||
%br
|
||||
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.
|
||||
%br
|
||||
GITLAB will send POST request with commits information on every push.
|
||||
%h5 Hooks request example:
|
||||
= render "hooks/data_ex"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
- bash_lexer = Pygments::Lexer[:bash]
|
||||
%h3 Workflow
|
||||
.back_link
|
||||
= link_to help_path do
|
||||
← to index
|
||||
%hr
|
||||
|
||||
%ol.help
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@
|
|||
:email => "gitlabdev@dv6700.(none)"
|
||||
}
|
||||
}
|
||||
]
|
||||
],
|
||||
total_commits_count => 3
|
||||
}
|
||||
eos
|
||||
%>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
= render "issues/head"
|
||||
.issues_content
|
||||
%h3
|
||||
%h3.page_title
|
||||
Issues
|
||||
%small (#{@issues.total_count})
|
||||
.right
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Issue ##{@issue.id}
|
||||
|
||||
%small
|
||||
|
|
|
|||
|
|
@ -1,8 +1,11 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
SSH Keys
|
||||
= link_to "Add new", new_key_path, :class => "btn small right"
|
||||
|
||||
%br
|
||||
%hr
|
||||
%p.slead
|
||||
SSH key allows you to establish a secure connection between your computer and Gitlab
|
||||
|
||||
|
||||
%table#keys-table.admin-table
|
||||
%thead
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Public key:
|
||||
= @key.title
|
||||
%small
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Merge Requests
|
||||
- if can? current_user, :write_issue, @project
|
||||
= link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
= "Merge Request ##{@merge_request.id}:"
|
||||
|
||||
%span.pretty_label.branch= @merge_request.source_branch
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
= render "issues/head"
|
||||
.milestones_content
|
||||
%h3
|
||||
%h3.page_title
|
||||
Milestones
|
||||
- if can? current_user, :admin_milestone, @project
|
||||
= link_to "New Milestone", new_project_milestone_path(@project), :class => "right btn small", :title => "New Milestone"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
%h3 Password
|
||||
%h3.page_title Password
|
||||
%hr
|
||||
= form_for @user, :url => profile_password_path, :method => :put do |f|
|
||||
.data
|
||||
.alert.alert-info
|
||||
%span After successful password update you will be redirected to login page where you should login with new password
|
||||
%p.slead After successful password update you will be redirected to login page where you should login with new password
|
||||
-if @user.errors.any?
|
||||
.alert-message.block-message.error
|
||||
%ul
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
.profile_avatar_holder
|
||||
= image_tag gravatar_icon(@user.email, 90), :class => "styled_image"
|
||||
%h3
|
||||
%h3.page_title
|
||||
= @user.name
|
||||
%br
|
||||
%small
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
%h3
|
||||
%h3.page_title
|
||||
Private token
|
||||
%span.cred.right
|
||||
keep it in secret!
|
||||
%hr
|
||||
= form_for @user, :url => profile_reset_private_token_path, :method => :put do |f|
|
||||
.data
|
||||
.alert.alert-info
|
||||
%p Private token used to access application resources without authentication.
|
||||
%p * required for rss feed
|
||||
%p.slead
|
||||
Private token used to access application resources without authentication.
|
||||
%br
|
||||
It can be used for atom feed or API
|
||||
%p.cgray
|
||||
- if current_user.private_token
|
||||
= text_field_tag "token", current_user.private_token
|
||||
= text_field_tag "token", current_user.private_token, :class => "xxlarge large_text"
|
||||
- else
|
||||
You don`t have one yet. Click generate to fix it.
|
||||
.actions
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%h3 Project Network Graph
|
||||
%h3.page_title Project Network Graph
|
||||
%br
|
||||
.graph_holder
|
||||
%h4
|
||||
|
|
|
|||
|
|
@ -1,16 +1,14 @@
|
|||
= render "project_head"
|
||||
%h3
|
||||
%h3.page_title
|
||||
Team Members
|
||||
%small (#{@project.users_projects.count})
|
||||
|
||||
- if can? current_user, :admin_team_member, @project
|
||||
.alert.alert-info
|
||||
%p.slead
|
||||
= link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
|
||||
New Team Member
|
||||
Read more about project permissions
|
||||
%strong= link_to "here", help_permissions_path, :class => "vlink"
|
||||
%br
|
||||
To open team member profile - click on avatar.
|
||||
|
||||
|
||||
= render :partial => "team", :locals => {:project => @project}
|
||||
|
|
|
|||
4
config/initializers/gitlab/10_app.rb
Normal file
4
config/initializers/gitlab/10_app.rb
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
module Gitlab
|
||||
Version = File.read(Rails.root.join("VERSION"))
|
||||
Revision = `git log --pretty=format:'%h' -n 1`
|
||||
end
|
||||
Loading…
Reference in a new issue