Commit a0db028c authored by Zevs's avatar Zevs

Merge remote-tracking branch 'avakarev/remove-trailing-whitespaces-in-templates'

parents f12ac71b 3bd06d55
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
%h5 %h5
Resque Workers Resque Workers
.data.padded .data.padded
= link_to "/info/resque" do = link_to "/info/resque" do
%h1{:class => @workers.present? ? "cgreen" : "cred"} %h1{:class => @workers.present? ? "cgreen" : "cred"}
= @workers.count = @workers.count
%hr %hr
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
.ui-box .ui-box
%h5 Projects %h5 Projects
.data.padded .data.padded
= link_to admin_projects_path do = link_to admin_projects_path do
%h1= Project.count %h1= Project.count
%hr %hr
= link_to 'New Project', new_admin_project_path, :class => "btn small" = link_to 'New Project', new_admin_project_path, :class => "btn small"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.ui-box .ui-box
%h5 Users %h5 Users
.data.padded .data.padded
= link_to admin_users_path do = link_to admin_users_path do
%h1= User.count %h1= User.count
%hr %hr
= link_to 'New User', new_admin_user_path, :class => "btn small" = link_to 'New User', new_admin_user_path, :class => "btn small"
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
= f.label :name = f.label :name
.input= f.text_field :name .input= f.text_field :name
.clearfix .clearfix
= f.label :path do = f.label :path do
Path Path
.input .input
.input-prepend .input-prepend
%span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:" %span.add-on= "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:"
= f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
.clearfix .clearfix
= f.label :code do = f.label :code do
Code Code
.input .input
.input-prepend .input-prepend
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
= f.label :owner_id = f.label :owner_id
.input= f.select :owner_id, User.all.map { |user| [user.name, user.id] } .input= f.select :owner_id, User.all.map { |user| [user.name, user.id] }
- if @admin_project.repo_exists? - if @admin_project.repo_exists?
.clearfix .clearfix
= f.label :default_branch, "Default Branch" = f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;") .input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;")
......
%h3 %h3
Projects Projects
= link_to 'New Project', new_admin_project_path, :class => "btn small right" = link_to 'New Project', new_admin_project_path, :class => "btn small right"
%br %br
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%b %b
Name: Name:
%td %td
= @admin_project.name = @admin_project.name
%tr %tr
%td %td
%b %b
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
%br %br
%h3 Add new team member %h3 Add new team member
%br %br
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do = form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
%table.zebra-striped.table-bordered %table.zebra-striped.table-bordered
%thead %thead
%tr %tr
...@@ -73,11 +73,11 @@ ...@@ -73,11 +73,11 @@
%tr %tr
%td= submit_tag 'Add', :class => "btn primary" %td= submit_tag 'Add', :class => "btn primary"
%td %td
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, :class => "vlink" %strong= link_to "here", help_permissions_path, :class => "vlink"
:css :css
form select { form select {
width:150px; width:150px;
} }
...@@ -85,9 +85,7 @@ ...@@ -85,9 +85,7 @@
width:300px; width:300px;
} }
:javascript
:javascript
$('select#user_ids').chosen(); $('select#user_ids').chosen();
$('select#repo_access').chosen(); $('select#repo_access').chosen();
$('select#project_access').chosen(); $('select#project_access').chosen();
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
= link_to 'Cancel', :back, :class => "btn" = link_to 'Cancel', :back, :class => "btn"
:css :css
form select { form select {
width:300px; width:300px;
} }
...@@ -25,4 +25,3 @@ ...@@ -25,4 +25,3 @@
$('select#team_member_project_id').chosen(); $('select#team_member_project_id').chosen();
$('select#team_member_repo_access').chosen(); $('select#team_member_repo_access').chosen();
$('select#team_member_project_access').chosen(); $('select#team_member_project_access').chosen();
%h3 %h3
Users Users
= link_to 'New User', new_admin_user_path, :class => "btn small right" = link_to 'New User', new_admin_user_path, :class => "btn small right"
%br %br
%ul.nav.nav-pills %ul.nav.nav-pills
%li{:class => "#{'active' unless params[:filter]}"} %li{:class => "#{'active' unless params[:filter]}"}
= link_to "Active", admin_users_path = link_to "Active", admin_users_path
%li{:class => "#{'active' if params[:filter] == "admins"}"} %li{:class => "#{'active' if params[:filter] == "admins"}"}
= link_to admin_users_path(:filter => "admins") do = link_to admin_users_path(:filter => "admins") do
Admins Admins
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
%td= user.users_projects.count %td= user.users_projects.count
%td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}", :class => "btn small" %td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}", :class => "btn small"
%td %td
- if user.blocked - if user.blocked
= link_to 'Unblock', unblock_admin_user_path(user), :method => :put, :class => "btn small success" = link_to 'Unblock', unblock_admin_user_path(user), :method => :put, :class => "btn small success"
- else - else
= link_to 'Block', block_admin_user_path(user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger" = link_to 'Block', block_admin_user_path(user), :confirm => 'USER WILL BE BLOCKED! Are you sure?', :method => :put, :class => "btn small danger"
%td= link_to 'Destroy', [:admin, user], :confirm => 'USER WILL BE REMOVED! Are you sure?', :method => :delete, :class => "btn small danger" %td= link_to 'Destroy', [:admin, user], :confirm => 'USER WILL BE REMOVED! Are you sure?', :method => :delete, :class => "btn small danger"
......
...@@ -53,11 +53,10 @@ ...@@ -53,11 +53,10 @@
%td %td
= @admin_user.twitter = @admin_user.twitter
%br %br
%h3 Add User to Projects %h3 Add User to Projects
%br %br
= form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do = form_tag team_update_admin_user_path(@admin_user), :class => "bulk_import", :method => :put do
%table.table-bordered %table.table-bordered
%thead %thead
%tr %tr
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
%tr %tr
%td= submit_tag 'Add', :class => "btn primary" %td= submit_tag 'Add', :class => "btn primary"
%td %td
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, :class => "vlink" %strong= link_to "here", help_permissions_path, :class => "vlink"
%br %br
...@@ -95,8 +94,8 @@ ...@@ -95,8 +94,8 @@
%td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small" %td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small"
%td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger" %td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger"
:css :css
form select { form select {
width:150px; width:150px;
} }
...@@ -104,9 +103,7 @@ ...@@ -104,9 +103,7 @@
width:300px; width:300px;
} }
:javascript
:javascript
$('select#project_ids').chosen(); $('select#project_ids').chosen();
$('select#repo_access').chosen(); $('select#repo_access').chosen();
$('select#project_access').chosen(); $('select#project_access').chosen();
- if @suppress_diff - if @suppress_diff
.alert-message.block-message .alert-message.block-message
%p %p
%strong Warning! Large commit with more then 200 files changed. %strong Warning! Large commit with more then 200 files changed.
%p To prevent performance issue we rejected diff information. %p To prevent performance issue we rejected diff information.
%p %p
But if you still want to see diff But if you still want to see diff
= link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark" = link_to "click this link", project_commit_path(@project, @commit.id, :force_show_diff => true), :class => "dark"
%p.cgray %p.cgray
Showing #{pluralize(diffs.count, "changed file")} Showing #{pluralize(diffs.count, "changed file")}
.file_stats .file_stats
= render "commits/diff_head", :diffs => diffs = render "commits/diff_head", :diffs => diffs
- unless @suppress_diff - unless @suppress_diff
- diffs.each_with_index do |diff, i| - diffs.each_with_index do |diff, i|
- next if diff.diff.empty? - next if diff.diff.empty?
...@@ -39,4 +37,3 @@ ...@@ -39,4 +37,3 @@
- else - else
%p %p
%center No preview for this file type %center No preview for this file type
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
= hidden_field_tag :destination, "commits" = hidden_field_tag :destination, "commits"
%li{:class => "#{'active' if current_page?(project_commits_path(@project)) }"} %li{:class => "#{'active' if current_page?(project_commits_path(@project)) }"}
= link_to project_commits_path(@project) do = link_to project_commits_path(@project) do
Commits Commits
%li{:class => "#{'active' if current_page?(compare_project_commits_path(@project)) }"} %li{:class => "#{'active' if current_page?(compare_project_commits_path(@project)) }"}
= link_to compare_project_commits_path(@project) do = link_to compare_project_commits_path(@project) do
Compare Compare
%li{:class => "#{branches_tab_class}"} %li{:class => "#{branches_tab_class}"}
= link_to project_repository_path(@project) do = link_to project_repository_path(@project) do
Branches Branches
%span.number= @project.repo.branch_count %span.number= @project.repo.branch_count
%li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"} %li{:class => "#{'active' if current_page?(tags_project_repository_path(@project)) }"}
= link_to tags_project_repository_path(@project) do = link_to tags_project_repository_path(@project) do
Tags Tags
%span.number= @project.repo.tag_count %span.number= @project.repo.tag_count
...@@ -24,10 +24,9 @@ ...@@ -24,10 +24,9 @@
- if current_page?(project_commits_path(@project)) && current_user.private_token - if current_page?(project_commits_path(@project)) && current_user.private_token
%li.right %li.right
%span.rss-icon %span.rss-icon
= link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do
= image_tag "rss_ui.png", :title => "feed" = image_tag "rss_ui.png", :title => "feed"
:javascript :javascript
$(function(){ $(function(){
$('.project-refs-select').chosen(); $('.project-refs-select').chosen();
......
...@@ -9,14 +9,14 @@ ...@@ -9,14 +9,14 @@
%td.old_line= "..." %td.old_line= "..."
%td.new_line= "..." %td.new_line= "..."
%td.line_content.matched= line %td.line_content.matched= line
- else - else
%td.old_line %td.old_line
= link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code = link_to raw(type == "new" ? " " : line_old), "##{line_code}", :id => line_code
- if @comments_allowed - if @comments_allowed
= link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line" = link_to "", "#", :class => "line_note_link", "line_code" => line_code, :title => "Add note for this line"
%td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code %td.new_line= link_to raw(type == "old" ? " " : line_new) , "##{line_code}", :id => line_code
%td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  " %td.line_content{:class => "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
- if @comments_allowed - if @comments_allowed
- comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
- unless comments.empty? - unless comments.empty?
......
= render "head" = render "head"
%h3 %h3
Compare View Compare View
%hr %hr
%div %div
%p %p
Fill input field with commit id like Fill input field with commit id like
%code '4eedf23' %code '4eedf23'
or branch/tag name like or branch/tag name like
%code master %code master
& press compare button for commits list, code diff. & press compare button for commits list, code diff.
%br %br
= form_tag compare_project_commits_path(@project), :method => :get do = form_tag compare_project_commits_path(@project), :method => :get do
.clearfix .clearfix
= text_field_tag :from, params[:from], :placeholder => "master", :class => "xlarge" = text_field_tag :from, params[:from], :placeholder => "master", :class => "xlarge"
= "..." = "..."
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
%h4 Diff %h4 Diff
= render "commits/diffs", :diffs => @diffs = render "commits/diffs", :diffs => @diffs
:javascript :javascript
$(function() { $(function() {
var availableTags = #{@project.heads.map(&:name).to_json}; var availableTags = #{@project.heads.map(&:name).to_json};
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%span.arrow %span.arrow
= link_to project_commits_path(@project) do = link_to project_commits_path(@project) do
= @project.name = @project.name
%span.divider %span.divider
\/ \/
%li %li
%a{:href => "#"}= params[:path].split("/").join(" / ") %a{:href => "#"}= params[:path].split("/").join(" / ")
......
...@@ -38,11 +38,11 @@ ...@@ -38,11 +38,11 @@
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){
$(".line_note_link, .line_note_reply_link").live("click", function(e) { $(".line_note_link, .line_note_reply_link").live("click", function(e) {
var form = $(".per_line_form"); var form = $(".per_line_form");
$(this).parent().parent().after(form); $(this).parent().parent().after(form);
form.find("#note_line_code").val($(this).attr("line_code")); form.find("#note_line_code").val($(this).attr("line_code"));
form.show(); form.show();
return false; return false;
}); });
}); });
= render "repositories/head" = render "repositories/head"
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
.alert-message.block-message .alert-message.block-message
Deploy keys allow read-only access to repository. Deploy keys allow read-only access to repository.
= link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
Add Deploy Key Add Deploy Key
- if @keys.any? - if @keys.any?
%table %table
......
.alert-message.block-message.error .alert-message.block-message.error
%h3 Encoding Error %h3 Encoding Error
%hr %hr
%p %p
Page cant be loaded cause of encoding error Page cant be loaded cause of encoding error
.alert-message.block-message.error .alert-message.block-message.error
%h3 Git Resource Not found %h3 Git Resource Not found
%hr %hr
%p %p
Application cant get access to some Application cant get access to some
%span.label branch %span.label branch
or or
%span.label commit %span.label commit
in your repository. Maybe it was moved in your repository. Maybe it was moved
- if event.allowed? - if event.allowed?
.event_feed .event_feed
- if event.issue? - if event.issue?
= render "events/event_issue", :event => event = render "events/event_issue", :event => event
- elsif event.merge_request? - elsif event.merge_request?
= render "events/event_merge_request", :event => event = render "events/event_merge_request", :event => event
- elsif event.push? - elsif event.push?
= render "events/event_push", :event => event = render "events/event_push", :event => event
= image_tag gravatar_icon(event.author_email), :class => "avatar" = image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name} %strong #{event.author_name}
%span.event_label= event.action_name %span.event_label= event.action_name
 issue  issue
= link_to project_issue_path(event.project, event.issue) do = link_to project_issue_path(event.project, event.issue) do
%strong= truncate event.issue_title %strong= truncate event.issue_title
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project
%span.cgray %span.cgray
= time_ago_in_words(event.created_at) = time_ago_in_words(event.created_at)
......
- if event.action_name == "merged" - if event.action_name == "merged"
.event_icon= image_tag "event_mr_merged.png" .event_icon= image_tag "event_mr_merged.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar" = image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name} %strong #{event.author_name}
%span.event_label= event.action_name %span.event_label= event.action_name
 merge request  merge request
= link_to project_merge_request_path(event.project, event.merge_request) do = link_to project_merge_request_path(event.project, event.merge_request) do
%strong= truncate event.merge_request_title %strong= truncate event.merge_request_title
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project
%span.cgray %span.cgray
= time_ago_in_words(event.created_at) = time_ago_in_words(event.created_at)
......
%div %div
.event_icon= image_tag "event_push.png" .event_icon= image_tag "event_push.png"
= image_tag gravatar_icon(event.author_email), :class => "avatar" = image_tag gravatar_icon(event.author_email), :class => "avatar"
%strong #{event.author_name} %strong #{event.author_name}
%span.event_label= event.push_action_name %span.event_label= event.push_action_name
= event.ref_type = event.ref_type
= link_to project_commits_path(event.project, :ref => event.ref_name) do = link_to project_commits_path(event.project, :ref => event.ref_name) do
%strong= event.ref_name %strong= event.ref_name
at at
%strong= link_to event.project.name, event.project %strong= link_to event.project.name, event.project
%span.cgray %span.cgray
= time_ago_in_words(event.created_at) = time_ago_in_words(event.created_at)
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
- if event.push_with_commits? - if event.push_with_commits?
- if event.commits_count > 1 - if event.commits_count > 1
= link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do = link_to compare_project_commits_path(event.project, :from => event.parent_commit.id, :to => event.last_commit.id) do
%strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]} %strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
- project = event.project - project = event.project
%ul.unstyled.event_commits %ul.unstyled.event_commits
- if event.commits_count > 3 - if event.commits_count > 3
- event.commits[0...2].each do |commit| - event.commits[0...2].each do |commit|
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
%li %li
%br %br
\... and #{event.commits_count - 2} more commits \... and #{event.commits_count - 2} more commits
- else - else
- event.commits.each do |commit| - event.commits.each do |commit|
= render "events/commit", :commit => commit, :project => project = render "events/commit", :commit => commit, :project => project
%h3.cgray %h3.cgray
GITLAB GITLAB
%span.right v2.5 %span.right v2.5
%hr %hr
%h4 Self Hosted Git Management %h4 Self Hosted Git Management
%h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite. %h4 Fast, secure and stable solution based on Ruby on Rails & Gitolite.
%hr %hr
......
%h3 Web hooks %h3 Web hooks
%br %br
%p Application will send POST request with some data like example below: %p Application will send POST request with some data like example below:
%h5 Hooks request example: %h5 Hooks request example:
.borders= render "hooks/data_ex" .borders= render "hooks/data_ex"
...@@ -6,33 +6,33 @@ ...@@ -6,33 +6,33 @@
%li %li
%p Clone project %p Clone project
.bash .bash
%pre %pre
git clone git@example.com:project-name.git git clone git@example.com:project-name.git
%li %li
%p Create branch with your feature %p Create branch with your feature
.bash .bash
%pre %pre
git checkout -b $feature_name git checkout -b $feature_name
%li %li
%p Write code. Commit changes %p Write code. Commit changes
.bash .bash
%pre %pre
git commit -am "My feature is ready" git commit -am "My feature is ready"
%li %li
%p Push your branch to gitlabhq %p Push your branch to gitlabhq
.bash .bash
%pre %pre
git push origin $feature_name git push origin $feature_name
%li %li
%p Review your code on Commits page %p Review your code on Commits page
%li %li
%p Create a merge request %p Create a merge request
%li %li
%p Your team lead will review code & merge it to main branch %p Your team lead will review code & merge it to main branch
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%span %span
Post receive hooks for binding events when someone push to repository. Post receive hooks for binding events when someone push to repository.
%br %br
Read more about web hooks Read more about web hooks
%strong #{link_to "here", help_web_hooks_path, :class => "vlink"} %strong #{link_to "here", help_web_hooks_path, :class => "vlink"}
= form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do |f| = form_for [@project, @hook], :as => :hook, :url => project_hooks_path(@project) do |f|
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
%tr %tr
%th URL %th URL
%th Method %th Method
%th %th
- @hooks.each do |hook| - @hooks.each do |hook|
%tr %tr
%td %td
...@@ -40,4 +40,3 @@ ...@@ -40,4 +40,3 @@
%td POST %td POST
%td %td
= link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right" = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small right"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.clearfix .clearfix
= f.label :critical, "Critical" = f.label :critical, "Critical"
.input= f.check_box :critical .input= f.check_box :critical
- unless @issue.new_record? - unless @issue.new_record?
.clearfix .clearfix
= f.label :closed = f.label :closed
...@@ -35,8 +35,6 @@ ...@@ -35,8 +35,6 @@
= f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14 = f.text_area :description, :maxlength => 2000, :class => "xxlarge", :rows => 14
%p.hint Markdown is enabled. %p.hint Markdown is enabled.
.actions .actions
- if @issue.new_record? - if @issue.new_record?
= f.submit 'Submit new issue', :class => "primary btn" = f.submit 'Submit new issue', :class => "primary btn"
...@@ -44,9 +42,9 @@ ...@@ -44,9 +42,9 @@
= f.submit 'Save changes', :class => "primary btn" = f.submit 'Save changes', :class => "primary btn"
- if request.xhr? - if request.xhr?
= link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
- else - else
- if @issue.new_record? - if @issue.new_record?
= link_to "Cancel", project_issues_path(@project), :class => "btn" = link_to "Cancel", project_issues_path(@project), :class => "btn"
- else - else
= link_to "Cancel", project_issue_path(@project, @issue), :class => "btn" = link_to "Cancel", project_issue_path(@project, @issue), :class => "btn"
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li{:class => "#{'active' if current_page?(project_issues_path(@project))}"} %li{:class => "#{'active' if current_page?(project_issues_path(@project))}"}
= link_to project_issues_path(@project), :class => "tab" do = link_to project_issues_path(@project), :class => "tab" do
Browse Issues Browse Issues
%li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"}
= link_to project_milestones_path(@project), :class => "tab" do = link_to project_milestones_path(@project), :class => "tab" do
Milestones Milestones
%li.right %li.right
%span.rss-icon %span.rss-icon
= link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
= image_tag "rss_ui.png", :title => "feed" = image_tag "rss_ui.png", :title => "feed"
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
= link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small padded", :remote => true = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small padded", :remote => true
- else - else
= link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small padded", :remote => true = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small padded", :remote => true
= link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do
%i.icon-edit %i.icon-edit
Edit Edit
...@@ -22,11 +22,5 @@ ...@@ -22,11 +22,5 @@
- if issue.upvotes > 0 - if issue.upvotes > 0
%span.label.success= "+#{issue.upvotes}" %span.label.success= "+#{issue.upvotes}"
= link_to project_issue_path(issue.project, issue) do = link_to project_issue_path(issue.project, issue) do
%p.row_title= truncate(issue.title, :length => 100) %p.row_title= truncate(issue.title, :length => 100)
= render "form" = render "form"
:javascript :javascript
$(function(){ $(function(){
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen(); $('select#issue_milestone_id').chosen();
}); });
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.right .right
.span5 .span5
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do = link_to new_project_issue_path(@project), :class => "right btn small", :title => "New Issue", :remote => true do
New Issue New Issue
= form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do = form_tag search_project_issues_path(@project), :method => :get, :remote => true, :id => "issue_search_form", :class => :right do
= hidden_field_tag :project_id, @project.id, { :id => 'project_id' } = hidden_field_tag :project_id, @project.id, { :id => 'project_id' }
...@@ -20,16 +20,16 @@ ...@@ -20,16 +20,16 @@
.span6 .span6
%ul.nav.nav-pills.left %ul.nav.nav-pills.left
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))} %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do = link_to project_issues_path(@project, :f => 0, :milestone_id => params[:milestone_id]) do
Open Open
%li{:class => ("active" if params[:f] == "2")} %li{:class => ("active" if params[:f] == "2")}
= link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do = link_to project_issues_path(@project, :f => 2, :milestone_id => params[:milestone_id]) do
Closed Closed
%li{:class => ("active" if params[:f] == "3")} %li{:class => ("active" if params[:f] == "3")}
= link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do = link_to project_issues_path(@project, :f => 3, :milestone_id => params[:milestone_id]) do
To Me To Me
%li{:class => ("active" if params[:f] == "1")} %li{:class => ("active" if params[:f] == "1")}
= link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do = link_to project_issues_path(@project, :f => 1, :milestone_id => params[:milestone_id]) do
All All
.span4.right .span4.right
......
= render "form" = render "form"
:javascript :javascript
$(function(){ $(function(){
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
$('select#issue_milestone_id').chosen(); $('select#issue_milestone_id').chosen();
}); });
......
%h3 %h3
Issue ##{@issue.id} Issue ##{@issue.id}
%small %small
created at created at
= @issue.created_at.stamp("Aug 21, 2011") = @issue.created_at.stamp("Aug 21, 2011")
%span.right %span.right
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
- else - else
= link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue" = link_to 'Close', project_issue_path(@project, @issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "btn small", :title => "Close Issue"
- if can?(current_user, :admin_project, @project) || @issue.author == current_user - if can?(current_user, :admin_project, @project) || @issue.author == current_user
= link_to edit_project_issue_path(@project, @issue), :class => "btn small" do = link_to edit_project_issue_path(@project, @issue), :class => "btn small" do
%i.icon-edit %i.icon-edit
Edit Edit
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}" .upvotes#upvotes= "+#{pluralize @issue.upvotes, 'upvote'}"
.back_link .back_link
= link_to project_issues_path(@project) do = link_to project_issues_path(@project) do
← To issues list ← To issues list
.main_box .main_box
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
%h4 %h4
- if @issue.closed - if @issue.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- else - else
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @issue.title = @issue.title
...@@ -37,17 +37,17 @@ ...@@ -37,17 +37,17 @@
= image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@issue.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_author(@issue) %strong.author= link_to_issue_author(@issue)
%cite.cgray and currently assigned to %cite.cgray and currently assigned to
= image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@issue.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_issue_assignee(@issue) %strong.author= link_to_issue_assignee(@issue)
- if @issue.milestone - if @issue.milestone
- milestone = @issue.milestone - milestone = @issue.milestone
%cite.cgray and attached to milestone %cite.cgray and attached to milestone
= link_to project_milestone_path(milestone.project, milestone) do = link_to project_milestone_path(milestone.project, milestone) do
%strong %strong
= truncate(milestone.title, :length => 20) = truncate(milestone.title, :length => 20)
- if @issue.description.present? - if @issue.description.present?
.bottom_box_content .bottom_box_content
= preserve do = preserve do
......
%h3 %h3
SSH Keys SSH Keys
= link_to "Add new", new_key_path, :class => "btn small right" = link_to "Add new", new_key_path, :class => "btn small right"
%br %br
%table#keys-table.admin-table %table#keys-table.admin-table
......
%h3 %h3
Public key: Public key:
= @key.title = @key.title
%small %small
created at created at
= @key.created_at.stamp("Aug 21, 2011") = @key.created_at.stamp("Aug 21, 2011")
.back_link .back_link
= link_to keys_path do = link_to keys_path do
← To keys list ← To keys list
%hr %hr
%pre= @key.key %pre= @key.key
.actions .actions
= link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key" = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key"
%nav.main_menu %nav.main_menu
= link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home" = link_to "Home", root_path, :class => "home #{"current" if current_page?(projects_path) || current_page?(root_path)}", :title => "Home"
= link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do = link_to dashboard_issues_path, :class => "#{"current" if current_page?(dashboard_issues_path)}", :id => "issues_slide" do
Issues Issues
%span.count= current_user.assigned_issues.opened.count %span.count= current_user.assigned_issues.opened.count
= link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
Requests Requests
%span.count= current_user.cared_merge_requests.count %span.count= current_user.cared_merge_requests.count
= link_to search_path, :class => "#{"current" if current_page?(search_path)}" do = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
Search Search
= link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}" = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
.container .container
.top_panel_content .top_panel_content
%div.app_logo %div.app_logo
= link_to root_path, :class => "home", :title => "Home" do = link_to root_path, :class => "home", :title => "Home" do
%h1 %h1
GITLAB GITLAB
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
= text_field_tag "search", nil, :placeholder => "Search", :class => "search-input" = text_field_tag "search", nil, :placeholder => "Search", :class => "search-input"
.fbtn .fbtn
- if current_user.is_admin? - if current_user.is_admin?
= link_to admin_root_path, :class => "btn small", :title => "Admin area" do = link_to admin_root_path, :class => "btn small", :title => "Admin area" do
%i.icon-cog %i.icon-cog
Admin Admin
- if current_user.can_create_project? - if current_user.can_create_project?
= link_to new_project_path, :class => "btn small", :title => "Create New Project" do = link_to new_project_path, :class => "btn small", :title => "Create New Project" do
%i.icon-plus %i.icon-plus
Project Project
.account-box .account-box
...@@ -43,4 +43,3 @@ ...@@ -43,4 +43,3 @@
} }
}); });
}); });
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
= link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project" = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
- if @project.repo_exists? - if @project.repo_exists?
- if can? current_user, :download_code, @project - if can? current_user, :download_code, @project
= link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
Files Files
= link_to "Commits", project_commits_path(@project), :class => commit_tab_class = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
- if @project.issues_enabled - if @project.issues_enabled
= link_to project_issues_filter_path(@project), :class => issues_tab? ? "current" : nil do = link_to project_issues_filter_path(@project), :class => issues_tab? ? "current" : nil do
Issues Issues
%span.count= @project.issues.opened.count %span.count= @project.issues.opened.count
- if @project.merge_requests_enabled - if @project.merge_requests_enabled
= link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do = link_to project_merge_requests_path(@project), :class => (controller.controller_name == "merge_requests") ? "current" : nil do
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
- if @project.wall_enabled - if @project.wall_enabled
= link_to wall_project_path(@project), :class => wall_tab? ? "current" : nil do = link_to wall_project_path(@project), :class => wall_tab? ? "current" : nil do
Wall Wall
- if @project.wiki_enabled - if @project.wiki_enabled
= link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do = link_to project_wiki_path(@project, :index), :class => (controller.controller_name == "wikis") ? "current" : nil do
Wiki Wiki
- unless @commits.empty? - unless @commits.empty?
.ui-box .ui-box
%h5 Commits (#{@commits.count}) %h5 Commits (#{@commits.count})
.merge-request-commits .merge-request-commits
- if @commits.count > 8 - if @commits.count > 8
%ul.first_mr_commits.unstyled %ul.first_mr_commits.unstyled
- @commits.first(8).each do |commit| - @commits.first(8).each do |commit|
= render "commits/commit", :commit => commit = render "commits/commit", :commit => commit
%li.bottom %li.bottom
8 of #{@commits.count} commits displayed. 8 of #{@commits.count} commits displayed.
%strong %strong
= link_to_function "Click here to show all", "MergeRequest.showAllCommits()" = link_to_function "Click here to show all", "MergeRequest.showAllCommits()"
%ul.all_mr_commits.hide.unstyled %ul.all_mr_commits.hide.unstyled
- @commits.each do |commit| - @commits.each do |commit|
= render "commits/commit", :commit => commit = render "commits/commit", :commit => commit
- else - else
%ul.unstyled %ul.unstyled
- @commits.each do |commit| - @commits.each do |commit|
= render "commits/commit", :commit => commit = render "commits/commit", :commit => commit
- else - else
%h5 %h5
Nothing to merge from Nothing to merge from
%span.label #{@merge_request.source_branch} %span.label #{@merge_request.source_branch}
to to
%span.label #{@merge_request.target_branch} %span.label #{@merge_request.target_branch}
%br %br
= render "commits/diffs", :diffs => @diffs = render "commits/diffs", :diffs => @diffs
- if @diffs.empty? - if @diffs.empty?
%p.cgray Nothing to merge %p.cgray Nothing to merge
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
.form-actions .form-actions
= f.submit 'Save', :class => "btn-primary btn" = f.submit 'Save', :class => "btn-primary btn"
- if @merge_request.new_record? - if @merge_request.new_record?
= link_to project_merge_requests_path(@project), :class => "btn" do = link_to project_merge_requests_path(@project), :class => "btn" do
Cancel Cancel
- else - else
= link_to project_merge_request_path(@project, @merge_request), :class => "btn" do = link_to project_merge_request_path(@project, @merge_request), :class => "btn" do
Cancel Cancel
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
$("#merge_request_source_branch").live("change", function() { $("#merge_request_source_branch").live("change", function() {
$.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() }); $.get("#{branch_from_project_merge_requests_path(@project)}", {ref: $(this).val() });
}); });
$("#merge_request_target_branch").live("change", function() { $("#merge_request_target_branch").live("change", function() {
$.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() }); $.get("#{branch_to_project_merge_requests_path(@project)}", {ref: $(this).val() });
}); });
}); });
......
.top-tabs .top-tabs
= link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do = link_to project_merge_requests_path(@project), :class => "tab #{'active' if current_page?(project_merge_requests_path(@project)) }" do
%span %span
Merge Requests Merge Requests
%h3 %h3
Merge Requests Merge Requests
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
= link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do = link_to new_project_merge_request_path(@project), :class => "right btn small", :title => "New Merge Request" do
New Merge Request New Merge Request
%br %br
...@@ -10,16 +10,16 @@ ...@@ -10,16 +10,16 @@
.title .title
%ul.nav.nav-pills %ul.nav.nav-pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))} %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_merge_requests_path(@project, :f => 0) do = link_to project_merge_requests_path(@project, :f => 0) do
Open Open
%li{:class => ("active" if params[:f] == "2")} %li{:class => ("active" if params[:f] == "2")}
= link_to project_merge_requests_path(@project, :f => 2) do = link_to project_merge_requests_path(@project, :f => 2) do
Closed Closed
%li{:class => ("active" if params[:f] == "3")} %li{:class => ("active" if params[:f] == "3")}
= link_to project_merge_requests_path(@project, :f => 3) do = link_to project_merge_requests_path(@project, :f => 3) do
To Me To Me
%li{:class => ("active" if params[:f] == "1")} %li{:class => ("active" if params[:f] == "1")}
= link_to project_merge_requests_path(@project, :f => 1) do = link_to project_merge_requests_path(@project, :f => 1) do
All All
%ul.unstyled %ul.unstyled
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
- if can?(current_user, :modify_merge_request, @merge_request) - if can?(current_user, :modify_merge_request, @merge_request)
- if @merge_request.open? - if @merge_request.open?
= link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request" = link_to 'Close', project_merge_request_path(@project, @merge_request, :merge_request => {:closed => true }, :status_only => true), :method => :put, :class => "btn small padded", :title => "Close merge request"
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do = link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small padded" do
%i.icon-edit %i.icon-edit
Edit Edit
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
= render "merge_requests/how_to_merge" = render "merge_requests/how_to_merge"
.back_link .back_link
= link_to project_merge_requests_path(@project) do = link_to project_merge_requests_path(@project) do
← To merge requests ← To merge requests
.main_box .main_box
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
%h4 %h4
- if @merge_request.closed - if @merge_request.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- else - else
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @merge_request.title = @merge_request.title
.middle_box_content .middle_box_content
%div %div
%cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by %cite.cgray Created at #{@merge_request.created_at.stamp("Aug 21, 2011")} by
= image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@merge_request.author_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_author(@merge_request) %strong.author= link_to_merge_request_author(@merge_request)
%cite.cgray and currently assigned to %cite.cgray and currently assigned to
= image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av" = image_tag gravatar_icon(@merge_request.assignee_email), :width => 16, :class => "lil_av"
%strong.author= link_to_merge_request_assignee(@merge_request) %strong.author= link_to_merge_request_assignee(@merge_request)
...@@ -46,11 +46,11 @@ ...@@ -46,11 +46,11 @@
.bottom_box_content .bottom_box_content
- if @merge_request.merged? - if @merge_request.merged?
%span %span
Merged by #{@merge_request.merge_event.author_name} Merged by #{@merge_request.merge_event.author_name}
%small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago. %small #{time_ago_in_words(@merge_request.merge_event.created_at)} ago.
- elsif @merge_request.closed_event - elsif @merge_request.closed_event
%span %span
Closed by #{@merge_request.closed_event.author_name} Closed by #{@merge_request.closed_event.author_name}
%small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago. %small #{time_ago_in_words(@merge_request.closed_event.created_at)} ago.
- unless can?(current_user, :accept_mr, @project) - unless can?(current_user, :accept_mr, @project)
...@@ -61,37 +61,34 @@ ...@@ -61,37 +61,34 @@
- if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project) - if @merge_request.open? && @commits.any? && can?(current_user, :accept_mr, @project)
.automerge_widget.can_be_merged{:style => "display:none"} .automerge_widget.can_be_merged{:style => "display:none"}
.alert.alert-success .alert.alert-success
%span %span
= link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true = link_to "Accept Merge Request", automerge_project_merge_request_path(@project, @merge_request), :class => "btn small info accept_merge_request", :remote => true
   
You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions You can accept this request automatically. If you still want to do it manually - #{link_to "click here", "#", :class => "how_to_merge_link vlink", :title => "How To Merge"} for instructions
.automerge_widget.cannot_be_merged{:style => "display:none"} .automerge_widget.cannot_be_merged{:style => "display:none"}
.alert.alert-info .alert.alert-info
%span %span
= link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge" = link_to "Show how to merge", "#", :class => "how_to_merge_link btn small padded", :title => "How To Merge"
   
%strong This request cant be merged with GitLab. You should do it manually %strong This request cant be merged with GitLab. You should do it manually
.automerge_widget.unchecked .automerge_widget.unchecked
.alert-message .alert-message
%strong %strong
%i.icon-refresh %i.icon-refresh
Checking for ability to automatically merge… Checking for ability to automatically merge…
.automerge_widget.already_cannot_be_merged{:style => "display:none"} .automerge_widget.already_cannot_be_merged{:style => "display:none"}
.alert.alert-info .alert.alert-info
%strong This merge request already can not be merged. Try to reload page. %strong This merge request already can not be merged. Try to reload page.
= render "merge_requests/commits" = render "merge_requests/commits"
- unless @commits.empty? - unless @commits.empty?
.nav.nav-tabs .nav.nav-tabs
%li.active %li.active
= link_to "#notes", :class => "merge-notes-tab tab" do = link_to "#notes", :class => "merge-notes-tab tab" do
Notes Notes
%li %li
= link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do = link_to "#diffs", "data-url" => diffs_project_merge_request_path(@project, @merge_request), :class => "merge-diffs-tab tab" do
...@@ -120,11 +117,11 @@ ...@@ -120,11 +117,11 @@
:javascript :javascript
$(document).ready(function(){ $(document).ready(function(){
$(".line_note_link, .line_note_reply_link").live("click", function(e) { $(".line_note_link, .line_note_reply_link").live("click", function(e) {
var form = $(".per_line_form"); var form = $(".per_line_form");
$(this).parent().parent().after(form); $(this).parent().parent().after(form);
form.find("#note_line_code").val($(this).attr("line_code")); form.find("#note_line_code").val($(this).attr("line_code"));
form.show(); form.show();
return false; return false;
}); });
}); });
%h3= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}" %h3= @milestone.new_record? ? "New Milestone" : "Edit Milestone ##{@milestone.id}"
.back_link .back_link
= link_to project_milestones_path(@project) do = link_to project_milestones_path(@project) do
← To milestones ← To milestones
%hr %hr
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
.controls .controls
.datepicker .datepicker
.form-actions .form-actions
- if @milestone.new_record? - if @milestone.new_record?
= f.submit 'Create milestone', :class => "primary btn" = f.submit 'Create milestone', :class => "primary btn"
...@@ -38,11 +37,11 @@ ...@@ -38,11 +37,11 @@
= f.submit 'Save changes', :class => "primary btn" = f.submit 'Save changes', :class => "primary btn"
- if request.xhr? - if request.xhr?
= link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn" = link_to "Cancel", "#back", :onclick => "backToIssues();", :class => "btn"
- else - else
- if @milestone.new_record? - if @milestone.new_record?
= link_to "Cancel", project_milestones_path(@project), :class => "btn" = link_to "Cancel", project_milestones_path(@project), :class => "btn"
- else - else
= link_to "Cancel", project_milestone_path(@project, @milestone), :class => "btn" = link_to "Cancel", project_milestone_path(@project, @milestone), :class => "btn"
:javascript :javascript
......
= render "form" = render "form"
:javascript :javascript
$(function(){ $(function(){
$('select#issue_assignee_id').chosen(); $('select#issue_assignee_id').chosen();
}); });
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
.title .title
%ul.nav.nav-pills %ul.nav.nav-pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))} %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_milestones_path(@project, :f => 0) do = link_to project_milestones_path(@project, :f => 0) do
Active Active
%li{:class => ("active" if params[:f] == "1")} %li{:class => ("active" if params[:f] == "1")}
= link_to project_milestones_path(@project, :f => 1) do = link_to project_milestones_path(@project, :f => 1) do
All All
%ul.unstyled %ul.unstyled
......
...@@ -6,12 +6,12 @@ ...@@ -6,12 +6,12 @@
%span.right %span.right
= link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn edit-milestone-link small" = link_to 'Browse Issues', project_issues_path(@milestone.project, :milestone_id => @milestone.id), :class => "btn edit-milestone-link small"
- if can?(current_user, :admin_milestone, @project) - if can?(current_user, :admin_milestone, @project)
= link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do = link_to edit_project_milestone_path(@project, @milestone), :class => "btn small" do
%i.icon-edit %i.icon-edit
Edit Edit
.back_link .back_link
= link_to project_milestones_path(@project) do = link_to project_milestones_path(@project) do
← To milestones list ← To milestones list
.main_box .main_box
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
%h5 %h5
- if @milestone.closed - if @milestone.closed
.alert-message.error.status_info Closed .alert-message.error.status_info Closed
- else - else
.alert-message.success.status_info Open .alert-message.success.status_info Open
= @milestone.title = @milestone.title
%small.right= @milestone.expires_at %small.right= @milestone.expires_at
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
- @issues.each do |issue| - @issues.each do |issue|
%tr %tr
%td %td
= link_to [@project, issue] do = link_to [@project, issue] do
= image_tag gravatar_icon(issue.assignee_email, 16), :width => "16" = image_tag gravatar_icon(issue.assignee_email, 16), :width => "16"
   
%span.badge.badge-info ##{issue.id} %span.badge.badge-info ##{issue.id}
......
...@@ -14,12 +14,12 @@ ...@@ -14,12 +14,12 @@
.span4 .span4
%h5 Notify via email: %h5 Notify via email:
.clearfix .clearfix
= label_tag :notify do = label_tag :notify do
= check_box_tag :notify, 1, @note.noteable_type != "Commit" = check_box_tag :notify, 1, @note.noteable_type != "Commit"
%span Project team %span Project team
- if @note.notify_only_author?(current_user) - if @note.notify_only_author?(current_user)
= label_tag :notify_author do = label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
%span Commit author %span Commit author
.span8 .span8
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:plain :plain
NoteList.setContent(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}"); NoteList.setContent(#{@notes.last.id}, #{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
- else - else
- if params[:first_id] - if params[:first_id]
:plain :plain
NoteList.append(#{params[:first_id]}, ""); NoteList.append(#{params[:first_id]}, "");
...@@ -15,19 +15,19 @@ ...@@ -15,19 +15,19 @@
= f.text_area :note, :size => 255 = f.text_area :note, :size => 255
%h5 Notify via email: %h5 Notify via email:
.clearfix .clearfix
= label_tag :notify do = label_tag :notify do
= check_box_tag :notify, 1, @note.noteable_type != "Commit" = check_box_tag :notify, 1, @note.noteable_type != "Commit"
%span Project team %span Project team
- if @note.notify_only_author?(current_user) - if @note.notify_only_author?(current_user)
= label_tag :notify_author do = label_tag :notify_author do
= check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit"
%span Commit author %span Commit author
.actions .actions
= f.submit 'Add note', :class => "btn primary", :id => "submit_note" = f.submit 'Add note', :class => "btn primary", :id => "submit_note"
= link_to "Close", "#", :class => "btn hide-button" = link_to "Close", "#", :class => "btn hide-button"
:javascript :javascript
$(function(){ $(function(){
$(".per_line_form .hide-button").bind("click", function(){ $(".per_line_form .hide-button").bind("click", function(){
$('.per_line_form').hide(); $('.per_line_form').hide();
......
%tr.line_notes_row %tr.line_notes_row
%td{:colspan => 3} %td{:colspan => 3}
%ul %ul
= render :partial => "notes/show", :locals => {:note => note} = render :partial => "notes/show", :locals => {:note => note}
%tr.line_notes_row.reply %tr.line_notes_row.reply
%td{:colspan => 3} %td{:colspan => 3}
= link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line" = link_to "Reply", "#", :class => "line_note_reply_link", "line_code" => line_code, :title => "Add note for this line"
- if @note.line_code - if @note.line_code
= render "create_line", :note => @note = render "create_line", :note => @note
- else - else
= render "create_common", :note => @note = render "create_common", :note => @note
-# Enable submit button -# Enable submit button
......
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
%h3 Application theme %h3 Application theme
%hr %hr
.clearfix .clearfix
= label_tag do = label_tag do
= f.radio_button :theme_id, 1 = f.radio_button :theme_id, 1
Default Default
= label_tag do = label_tag do
= f.radio_button :theme_id, 2 = f.radio_button :theme_id, 2
Classic Classic
%br %br
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
= f.radio_button :dark_scheme, true = f.radio_button :dark_scheme, true
Dark code preview Dark code preview
:javascript :javascript
$(function(){ $(function(){
$(".edit_user input").bind("click", function() { $(".edit_user input").bind("click", function() {
$(".edit_user").submit(); $(".edit_user").submit();
}); });
......
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
You can change your avatar at gravatar.com You can change your avatar at gravatar.com
%h4 %h4
Personal projects: Personal projects:
%small.right %small.right
%span= current_user.my_own_projects.count %span= current_user.my_own_projects.count
of of
%span= current_user.projects_limit %span= current_user.projects_limit
.progress .progress
.bar{:style => "width: #{current_user.projects_limit_percent}%;"} .bar{:style => "width: #{current_user.projects_limit_percent}%;"}
...@@ -65,6 +65,5 @@ ...@@ -65,6 +65,5 @@
= link_to "Add Public Key", new_key_path, :class => "btn small right" = link_to "Add Public Key", new_key_path, :class => "btn small right"
.form-actions .form-actions
= f.submit 'Save', :class => "btn-primary btn" = f.submit 'Save', :class => "btn-primary btn"
%h3 %h3
Private token Private token
%span.cred.right %span.cred.right
keep it in secret! keep it in secret!
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
.alert.alert-info .alert.alert-info
%h5 Advanced settings: %h5 Advanced settings:
.clearfix .clearfix
= f.label :path do = f.label :path do
Git Clone Git Clone
.input .input
.input-prepend .input-prepend
...@@ -22,19 +22,19 @@ ...@@ -22,19 +22,19 @@
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%span.add-on= ".git" %span.add-on= ".git"
.clearfix .clearfix
= f.label :code do = f.label :code do
URL URL
.input .input
.input-prepend .input-prepend
%span.add-on= web_app_url %span.add-on= web_app_url
= f.text_field :code, :placeholder => "example" = f.text_field :code, :placeholder => "example"
- unless @project.new_record? || @project.heads.empty? - unless @project.new_record? || @project.heads.empty?
.clearfix .clearfix
= f.label :default_branch, "Default Branch" = f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;") .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
- unless @project.new_record? - unless @project.new_record?
.alert.alert-info .alert.alert-info
%h5 Features: %h5 Features:
...@@ -49,13 +49,13 @@ ...@@ -49,13 +49,13 @@
.clearfix .clearfix
= f.label :wall_enabled, "Wall" = f.label :wall_enabled, "Wall"
.input= f.check_box :wall_enabled .input= f.check_box :wall_enabled
.clearfix .clearfix
= f.label :wiki_enabled, "Wiki" = f.label :wiki_enabled, "Wiki"
.input= f.check_box :wiki_enabled .input= f.check_box :wiki_enabled
%br %br
.actions .actions
= f.submit 'Save', :class => "btn primary" = f.submit 'Save', :class => "btn primary"
= link_to 'Cancel', @project, :class => "btn" = link_to 'Cancel', @project, :class => "btn"
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
.alert.alert-info .alert.alert-info
%h5 Advanced settings: %h5 Advanced settings:
.clearfix .clearfix
= f.label :path do = f.label :path do
Git Clone Git Clone
.input .input
.input-prepend .input-prepend
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
= f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record? = f.text_field :path, :placeholder => "example_project", :disabled => !@project.new_record?
%span.add-on= ".git" %span.add-on= ".git"
.clearfix .clearfix
= f.label :code do = f.label :code do
URL URL
.input .input
.input-prepend .input-prepend
......
%ul.nav.nav-tabs %ul.nav.nav-tabs
%li{ :class => "#{'active' if current_page?(project_path(@project)) }" } %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 %i.icon-home
Show Show
%li{ :class => " #{'active' if (controller.controller_name == "team_members") || current_page?(team_project_path(@project)) }" } %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 %i.icon-user
Team Team
%li{ :class => "#{'active' if current_page?(files_project_path(@project)) }" } %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 Attachments
%li{ :class => " #{'active' if (controller.controller_name == "snippets") }" } %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 Snippets
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
%li.right{:class => "#{'active' if controller.controller_name == "deploy_keys"}"} %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 %span
Deploy Keys Deploy Keys
%li.right{:class => "#{'active' if controller.controller_name == "hooks" }"} %li.right{:class => "#{'active' if controller.controller_name == "hooks" }"}
= link_to project_hooks_path(@project) do = link_to project_hooks_path(@project) do
%span %span
Hooks Hooks
%li.right{ :class => "#{'active' if current_page?(edit_project_path(@project)) }" } %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 %i.icon-edit
Edit Edit
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
   
%a.btn{:href => project_commits_path(@project)} Commits %a.btn{:href => project_commits_path(@project)} Commits
%strong.right %strong.right
= link_to project_path(@project) do = link_to project_path(@project) do
Switch to project → Switch to project →
%br %br
.alert-message.block-message.warning .alert-message.block-message.warning
.input .input
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
:javascript :javascript
$(function(){ $(function(){
$('.repo-access-select, .project-access-select').live("change", function() { $('.repo-access-select, .project-access-select').live("change", function() {
$(this.form).submit(); $(this.form).submit();
}); });
}) })
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
.alert-message.block-message.error .alert-message.block-message.error
%ul %ul
%li You have no ssh keys added to your profile. %li You have no ssh keys added to your profile.
%li You wont be able to pull/push repository. %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 Visit profile → keys and add public key of every machine you want to use for work with gitlabhq.
.alert-message.block-message.error .alert-message.block-message.error
%ul.unstyled.alert_holder %ul.unstyled.alert_holder
%li You should push repository to proceed. %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] - bash_lexer = Pygments::Lexer[:bash]
%div.git-empty %div.git-empty
%h3 Git global setup: %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") "git config --global user.email \"#{current_user.email}\""].join("\n")
= preserve do = preserve do
= raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'}) = raw bash_lexer.highlight(setup_str, :lexer => 'bash', :options => {:encoding => 'utf-8'})
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
%h3 Create Repository %h3 Create Repository
- repo_setup_str = ["mkdir #{@project.path}", - repo_setup_str = ["mkdir #{@project.path}",
"cd #{@project.path}", "cd #{@project.path}",
"git init", "git init",
"touch README", "touch README",
"git add README", "git add README",
"git commit -m 'first commit'", "git commit -m 'first commit'",
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
= image_tag gravatar_icon(note.author_email), :class => "left", :width => 16 = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
   
= note.attachment_identifier = note.attachment_identifier
%td %td
Added Added
= time_ago_in_words(note.created_at) = time_ago_in_words(note.created_at)
ago ago
- else - else
.alert-message.block-message .alert-message.block-message
%p All files attached to project wall, issues etc will be displayed here %p All files attached to project wall, issues etc will be displayed here
......
...@@ -4,14 +4,14 @@ ...@@ -4,14 +4,14 @@
- if current_user.require_ssh_key? - if current_user.require_ssh_key?
.alert.alert-error.padded .alert.alert-error.padded
%span %span
You wont be able to pull/push project code unless you You wont be able to pull/push project code unless you
%strong %strong
= link_to new_key_path, :class => "vlink" do = link_to new_key_path, :class => "vlink" do
add new key add new key
to your profile to your profile
- if @events.any? - if @events.any?
= render @events = render @events
- else - else
.padded .padded
%strong.cgray Projects activity will be displayed here %strong.cgray Projects activity will be displayed here
.side .side
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
(#{@projects.total_count}) (#{@projects.total_count})
- if current_user.can_create_project? - if current_user.can_create_project?
%span.right %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 %i.icon-plus
New Project New Project
- @projects.each do |project| - @projects.each do |project|
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
→ →
.bottom= paginate @projects, :theme => "gitlab" .bottom= paginate @projects, :theme => "gitlab"
- else - else
%h3 Nothing here %h3 Nothing here
%br %br
- if current_user.can_create_project? - if current_user.can_create_project?
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
= current_user.projects_limit = current_user.projects_limit
projects. Click on link below to add a new one projects. Click on link below to add a new one
.link_holder .link_holder
= link_to new_project_path, :class => "" do = link_to new_project_path, :class => "" do
New Project » New Project »
- else - else
If you will be added to project - it will be displayed here If you will be added to project - it will be displayed here
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
.row .row
-#.span2 -#.span2
.back_link .back_link
= link_to projects_path do = link_to projects_path do
← To projects list ← To projects list
.span7 .span7
.form-horizontal .form-horizontal
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
.span4.right .span4.right
.right .right
- if can? current_user, :download_code, @project - 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 %i.icon-download-alt
Download Download
- if @project.merge_requests_enabled && can?(current_user, :write_merge_request, @project) - 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 Merge Request
- if @project.issues_enabled && can?(current_user, :write_issue, @project) - 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 Issue
- unless @events.blank? - unless @events.blank?
......
= render "project_head" = render "project_head"
%h3 %h3
Team Members Team Members
%small (#{@project.users_projects.count}) %small (#{@project.users_projects.count})
- if can? current_user, :admin_team_member, @project - if can? current_user, :admin_team_member, @project
.alert.alert-info .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 New Team Member
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, :class => "vlink" %strong= link_to "here", help_permissions_path, :class => "vlink"
%br %br
To open team member profile - click on avatar. To open team member profile - click on avatar.
= render :partial => "team", :locals => {:project => @project} = render :partial => "team", :locals => {:project => @project}
......
= render "repositories/branches_head" = render "repositories/branches_head"
.alert .alert
%p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}. %p Protected branches designed to prevent push for all except #{link_to "masters", help_permissions_path, :class => "vlink"}.
%p This ability allows: %p This ability allows:
%ul %ul
%li keep stable branches secured %li keep stable branches secured
%li forced code review before merge to protected branches %li forced code review before merge to protected branches
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
   
= f.submit 'Protect', :class => "primary btn" = f.submit 'Protect', :class => "primary btn"
- unless @branches.empty? - unless @branches.empty?
%table.admin-table %table.admin-table
%thead %thead
...@@ -48,9 +47,5 @@ ...@@ -48,9 +47,5 @@
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
= link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small" = link_to 'Unprotect', [@project, branch], :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
:javascript :javascript
$('select#protected_branch_name').chosen(); $('select#protected_branch_name').chosen();
...@@ -5,6 +5,6 @@ ...@@ -5,6 +5,6 @@
= hidden_field_tag :destination, "tree" = hidden_field_tag :destination, "tree"
= hidden_field_tag :path, params[:path] = hidden_field_tag :path, params[:path]
%li{:class => "#{'active' if (controller.controller_name == "refs") }"} %li{:class => "#{'active' if (controller.controller_name == "refs") }"}
= link_to tree_project_ref_path(@project, @ref) do = link_to tree_project_ref_path(@project, @ref) do
Source Source
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
= image_tag "file_txt.png" = image_tag "file_txt.png"
- elsif content.image? - elsif content.image?
= image_tag "file_img.png" = image_tag "file_img.png"
- else - else
= image_tag "file_bin.png" = image_tag "file_bin.png"
- else - else
= image_tag "file_dir.png" = image_tag "file_dir.png"
......
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
#tree-holder= render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree} #tree-holder= render :partial => "tree", :locals => {:repo => @repo, :commit => @commit, :tree => @tree}
:javascript :javascript
$(function() { $(function() {
Tree.init(); Tree.init();
}); });
= render "commits/head" = render "commits/head"
%ul.nav.nav-pills %ul.nav.nav-pills
%li{:class => ("active" if current_page?(project_repository_path(@project)))} %li{:class => ("active" if current_page?(project_repository_path(@project)))}
= link_to project_repository_path(@project) do = link_to project_repository_path(@project) do
Recent Recent
%li{:class => ("active" if current_page?(project_protected_branches_path(@project)))} %li{:class => ("active" if current_page?(project_protected_branches_path(@project)))}
= link_to project_protected_branches_path(@project) do = link_to project_protected_branches_path(@project) do
Protected Protected
%li{:class => ("active" if current_page?(branches_project_repository_path(@project)))} %li{:class => ("active" if current_page?(branches_project_repository_path(@project)))}
= link_to branches_project_repository_path(@project) do = link_to branches_project_repository_path(@project) do
All All
- commit = update - commit = update
%tr %tr
%td %td
= link_to project_commits_path(@project, :ref => commit.head.name) do = link_to project_commits_path(@project, :ref => commit.head.name) do
%strong %strong
= commit.head.name = commit.head.name
- if commit.head.name == @project.root_ref - if commit.head.name == @project.root_ref
......
...@@ -26,5 +26,5 @@ ...@@ -26,5 +26,5 @@
- if can? current_user, :download_code, @project - if can? current_user, :download_code, @project
= link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "visible_link download_repo_link" = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "visible_link download_repo_link"
- else - else
%h3 No tags %h3 No tags
= form_tag search_path, :method => :get do |f| = form_tag search_path, :method => :get do |f|
.padded .padded
= label_tag :search do = label_tag :search do
%strong Looking for %strong Looking for
.input .input
= text_field_tag :search, params[:search],:placeholder => "issue 143", :class => "input-xxlarge" = text_field_tag :search, params[:search],:placeholder => "issue 143", :class => "input-xxlarge"
...@@ -13,30 +13,30 @@ ...@@ -13,30 +13,30 @@
- if @projects.empty? && @merge_requests.empty? - if @projects.empty? && @merge_requests.empty?
%h3 %h3
%small Nothing here %small Nothing here
- else - else
- if @projects.any? - if @projects.any?
%h4 Projects %h4 Projects
.padded .padded
- @projects.each do |project| - @projects.each do |project|
= link_to project do = link_to project do
%h4 %h4
%span.ico.project %span.ico.project
= project.name = project.name
%small %small
last activity at last activity at
= project.last_activity_date.stamp("Aug 25, 2011") = project.last_activity_date.stamp("Aug 25, 2011")
- if @merge_requests.any? - if @merge_requests.any?
%h4 Merge Requests %h4 Merge Requests
.padded .padded
- @merge_requests.each do |merge_request| - @merge_requests.each do |merge_request|
= link_to [merge_request.project, merge_request] do = link_to [merge_request.project, merge_request] do
%h5 %h5
Merge Request # Merge Request #
= merge_request.id = merge_request.id
– –
= truncate merge_request.title, :length => 50 = truncate merge_request.title, :length => 50
%small %small
updated at updated at
= merge_request.updated_at.stamp("Aug 25, 2011") = merge_request.updated_at.stamp("Aug 25, 2011")
%strong %strong
%span.label= merge_request.project.name %span.label= merge_request.project.name
...@@ -44,14 +44,14 @@ ...@@ -44,14 +44,14 @@
%h4 Issues %h4 Issues
.padded .padded
- @issues.each do |issue| - @issues.each do |issue|
= link_to [issue.project, issue] do = link_to [issue.project, issue] do
%h5 %h5
Issue # Issue #
= issue.id = issue.id
– –
= truncate issue.title, :length => 50 = truncate issue.title, :length => 50
%small %small
updated at updated at
= issue.updated_at.stamp("Aug 25, 2011") = issue.updated_at.stamp("Aug 25, 2011")
%strong %strong
%span.label= issue.project.name %span.label= issue.project.name
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
:javascript :javascript
$(function(){ $(function(){
$('select#snippet_expires_at').chosen(); $('select#snippet_expires_at').chosen();
}); });
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
- if can? current_user, :write_snippet, @project - if can? current_user, :write_snippet, @project
.alert-message.block-message .alert-message.block-message
= link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do = link_to new_project_snippet_path(@project), :class => "btn small add_new right", :title => "New Snippet" do
Add new snippet Add new snippet
Share code pastes with others if it cant be in a git repository Share code pastes with others if it cant be in a git repository
%br %br
To add new snippet - click on button. To add new snippet - click on button.
- unless @snippets.fresh.empty? - unless @snippets.fresh.empty?
%table.zebra-striped.borders= render @snippets.fresh %table.zebra-striped.borders= render @snippets.fresh
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
= link_to "Cancel", team_project_path(@project), :class => "btn" = link_to "Cancel", team_project_path(@project), :class => "btn"
:css :css
form select { form select {
width:300px; width:300px;
} }
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
- if user.blocked - if user.blocked
%span.label Blocked %span.label Blocked
= link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
= image_tag gravatar_icon(user.email, 40), :class => "avatar" = image_tag gravatar_icon(user.email, 40), :class => "avatar"
= link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do = link_to project_team_member_path(@project, member), :title => user.name, :class => "dark" do
%strong= truncate(user.name, :lenght => 40) %strong= truncate(user.name, :lenght => 40)
%br %br
%div.cgray= user.email %div.cgray= user.email
......
- if @team_member.valid? - if @team_member.valid?
:plain :plain
$("#new_team_member").hide("slide", { direction: "right" }, 150, function(){ $("#new_team_member").hide("slide", { direction: "right" }, 150, function(){
$("#team-table").show("slide", { direction: "left" }, 150, function() { $("#team-table").show("slide", { direction: "left" }, 150, function() {
$("#new_team_member").remove(); $("#new_team_member").remove();
$("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}"); $("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}");
$(".add_new").show(); $(".add_new").show();
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%hr %hr
.back_link .back_link
%br %br
= link_to team_project_path(@project), :class => "" do = link_to team_project_path(@project), :class => "" do
← To team list ← To team list
%br %br
.row .row
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
:javascript :javascript
$(function(){ $(function(){
$('.repo-access-select, .project-access-select').live("change", function() { $('.repo-access-select, .project-access-select').live("change", function() {
$(this.form).submit(); $(this.form).submit();
}); });
}) })
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
%li= msg %li= msg
.alert-message.block-message.warning .alert-message.block-message.warning
%p %p
Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}. Wiki content is parsed with #{link_to "Markdown", "http://en.wikipedia.org/wiki/Markdown"}.
%br %br
To add link to new page you can just type To add link to new page you can just type
%code [Link Title](page-slug) %code [Link Title](page-slug)
.clearfix .clearfix
= f.label :title = f.label :title
......
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