Remove trailing whitespaces and trailing lines
This commit is contained in:
Andrey Vakarev
parent
7e0726b1da
commit
3bd06d55e0
80 changed files with 261 additions and 296 deletions
|
|
@ -14,7 +14,7 @@
|
|||
.alert.alert-info
|
||||
%h5 Advanced settings:
|
||||
.clearfix
|
||||
= f.label :path do
|
||||
= f.label :path do
|
||||
Git Clone
|
||||
.input
|
||||
.input-prepend
|
||||
|
|
@ -22,19 +22,19 @@
|
|||
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
|
||||
%span.add-on= ".git"
|
||||
.clearfix
|
||||
= f.label :code do
|
||||
= f.label :code do
|
||||
URL
|
||||
.input
|
||||
.input-prepend
|
||||
%span.add-on= web_app_url
|
||||
= f.text_field :code, :placeholder => "example"
|
||||
|
||||
- unless @project.new_record? || @project.heads.empty?
|
||||
- unless @project.new_record? || @project.heads.empty?
|
||||
.clearfix
|
||||
= f.label :default_branch, "Default Branch"
|
||||
.input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
|
||||
|
||||
- unless @project.new_record?
|
||||
- unless @project.new_record?
|
||||
.alert.alert-info
|
||||
%h5 Features:
|
||||
|
||||
|
|
@ -49,13 +49,13 @@
|
|||
.clearfix
|
||||
= f.label :wall_enabled, "Wall"
|
||||
.input= f.check_box :wall_enabled
|
||||
|
||||
|
||||
.clearfix
|
||||
= f.label :wiki_enabled, "Wiki"
|
||||
.input= f.check_box :wiki_enabled
|
||||
|
||||
|
||||
%br
|
||||
|
||||
|
||||
.actions
|
||||
= f.submit 'Save', :class => "btn primary"
|
||||
= link_to 'Cancel', @project, :class => "btn"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
.alert.alert-info
|
||||
%h5 Advanced settings:
|
||||
.clearfix
|
||||
= f.label :path do
|
||||
= f.label :path do
|
||||
Git Clone
|
||||
.input
|
||||
.input-prepend
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
|
||||
%span.add-on= ".git"
|
||||
.clearfix
|
||||
= f.label :code do
|
||||
= f.label :code do
|
||||
URL
|
||||
.input
|
||||
.input-prepend
|
||||
|
|
|
|||
|
|
@ -1,30 +1,29 @@
|
|||
%ul.nav.nav-tabs
|
||||
%li{ :class => "#{'active' if current_page?(project_path(@project)) }" }
|
||||
= link_to project_path(@project), :class => "activities-tab tab" do
|
||||
= link_to project_path(@project), :class => "activities-tab tab" do
|
||||
%i.icon-home
|
||||
Show
|
||||
%li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" }
|
||||
= link_to team_project_path(@project), :class => "team-tab tab" do
|
||||
= link_to team_project_path(@project), :class => "team-tab tab" do
|
||||
%i.icon-user
|
||||
Team
|
||||
%li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" }
|
||||
= link_to files_project_path(@project), :class => "files-tab tab " do
|
||||
= link_to files_project_path(@project), :class => "files-tab tab " do
|
||||
Attachments
|
||||
%li{ :class => " #{'active' if (controller.controller_name == "snippets") }" }
|
||||
= link_to project_snippets_path(@project), :class => "snippets-tab tab" do
|
||||
= link_to project_snippets_path(@project), :class => "snippets-tab tab" do
|
||||
Snippets
|
||||
|
||||
- if can? current_user, :admin_project, @project
|
||||
%li.right{:class => "#{'active' if controller.controller_name == "deploy_keys"}"}
|
||||
= link_to project_deploy_keys_path(@project) do
|
||||
= link_to project_deploy_keys_path(@project) do
|
||||
%span
|
||||
Deploy Keys
|
||||
%li.right{:class => "#{'active' if controller.controller_name == "hooks" }"}
|
||||
= link_to project_hooks_path(@project) do
|
||||
= link_to project_hooks_path(@project) do
|
||||
%span
|
||||
Hooks
|
||||
%li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" }
|
||||
= link_to edit_project_path(@project), :class => "stat-tab tab " do
|
||||
= link_to edit_project_path(@project), :class => "stat-tab tab " do
|
||||
%i.icon-edit
|
||||
Edit
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
%a.btn{:href => project_commits_path(@project)} Commits
|
||||
%strong.right
|
||||
= link_to project_path(@project) do
|
||||
Switch to project →
|
||||
= link_to project_path(@project) do
|
||||
Switch to project →
|
||||
%br
|
||||
.alert-message.block-message.warning
|
||||
.input
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
:javascript
|
||||
$(function(){
|
||||
$('.repo-access-select, .project-access-select').live("change", function() {
|
||||
$('.repo-access-select, .project-access-select').live("change", function() {
|
||||
$(this.form).submit();
|
||||
});
|
||||
})
|
||||
|
|
|
|||
|
|
@ -2,18 +2,18 @@
|
|||
.alert-message.block-message.error
|
||||
%ul
|
||||
%li You have no ssh keys added to your profile.
|
||||
%li You wont be able to pull/push repository.
|
||||
%li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
|
||||
%li You wont be able to pull/push repository.
|
||||
%li Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
|
||||
|
||||
.alert-message.block-message.error
|
||||
%ul.unstyled.alert_holder
|
||||
%li You should push repository to proceed.
|
||||
%li After push you will be able to browse code, commits etc.
|
||||
%li After push you will be able to browse code, commits etc.
|
||||
|
||||
- bash_lexer = Pygments::Lexer[:bash]
|
||||
%div.git-empty
|
||||
%h3 Git global setup:
|
||||
- setup_str = ["git config --global user.name \"#{current_user.name}\"",
|
||||
- setup_str = ["git config --global user.name \"#{current_user.name}\"",
|
||||
"git config --global user.email \"#{current_user.email}\""].join("\n")
|
||||
= preserve do
|
||||
= raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
%h3 Create Repository
|
||||
- repo_setup_str = ["mkdir #{@project.path}",
|
||||
"cd #{@project.path}",
|
||||
"git init",
|
||||
"git init",
|
||||
"touch README",
|
||||
"git add README",
|
||||
"git commit -m 'first commit'",
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@
|
|||
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
|
||||
|
||||
= note.attachment_identifier
|
||||
%td
|
||||
%td
|
||||
Added
|
||||
= time_ago_in_words(note.created_at)
|
||||
ago
|
||||
- else
|
||||
- else
|
||||
.alert-message.block-message
|
||||
%p All files attached to project wall, issues etc will be displayed here
|
||||
|
||||
|
|
|
|||
|
|
@ -4,14 +4,14 @@
|
|||
- if current_user.require_ssh_key?
|
||||
.alert.alert-error.padded
|
||||
%span
|
||||
You wont be able to pull/push project code unless you
|
||||
You wont be able to pull/push project code unless you
|
||||
%strong
|
||||
= link_to new_key_path, :class => "vlink" do
|
||||
= link_to new_key_path, :class => "vlink" do
|
||||
add new key
|
||||
to your profile
|
||||
- if @events.any?
|
||||
= render @events
|
||||
- else
|
||||
- else
|
||||
.padded
|
||||
%strong.cgray Projects activity will be displayed here
|
||||
.side
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
(#{@projects.total_count})
|
||||
- if current_user.can_create_project?
|
||||
%span.right
|
||||
= link_to new_project_path, :class => "btn very_small info" do
|
||||
= link_to new_project_path, :class => "btn very_small info" do
|
||||
%i.icon-plus
|
||||
New Project
|
||||
- @projects.each do |project|
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
→
|
||||
.bottom= paginate @projects, :theme => "gitlab"
|
||||
|
||||
- else
|
||||
- else
|
||||
%h3 Nothing here
|
||||
%br
|
||||
- if current_user.can_create_project?
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
= current_user.projects_limit
|
||||
projects. Click on link below to add a new one
|
||||
.link_holder
|
||||
= link_to new_project_path, :class => "" do
|
||||
New Project »
|
||||
- else
|
||||
= link_to new_project_path, :class => "" do
|
||||
New Project »
|
||||
- else
|
||||
If you will be added to project - it will be displayed here
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
.row
|
||||
-#.span2
|
||||
.back_link
|
||||
= link_to projects_path do
|
||||
= link_to projects_path do
|
||||
← To projects list
|
||||
.span7
|
||||
.form-horizontal
|
||||
|
|
@ -14,14 +14,14 @@
|
|||
.span4.right
|
||||
.right
|
||||
- if can? current_user, :download_code, @project
|
||||
= link_to archive_project_repository_path(@project), :class => "btn small padded" do
|
||||
= link_to archive_project_repository_path(@project), :class => "btn small padded" do
|
||||
%i.icon-download-alt
|
||||
Download
|
||||
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project)
|
||||
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
|
||||
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small padded" do
|
||||
Merge Request
|
||||
- if @project.issues_enabled && can?(current_user, :write_issue, @project)
|
||||
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
|
||||
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
|
||||
Issue
|
||||
|
||||
- unless @events.blank?
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
= render "project_head"
|
||||
%h3
|
||||
%h3
|
||||
Team Members
|
||||
%small (#{@project.users_projects.count})
|
||||
|
||||
- if can? current_user, :admin_team_member, @project
|
||||
.alert.alert-info
|
||||
= link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
|
||||
= 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
|
||||
Read more about project permissions
|
||||
%strong= link_to "here", help_permissions_path, :class => "vlink"
|
||||
%br
|
||||
To open team member profile - click on avatar.
|
||||
To open team member profile - click on avatar.
|
||||
|
||||
|
||||
= render :partial => "team", :locals => {:project => @project}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue