Commit f1c534c6 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'master' of github.com:gitlabhq/gitlabhq

parents dfe9f367 fc49b201
...@@ -25,4 +25,4 @@ ...@@ -25,4 +25,4 @@
:javascript :javascript
$(function() { $(function() {
$( "#accordion" ).accordion(); }); $("#accordion").accordion(); });
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
%h3 %h3
Team Team
%small %small
( #{@admin_project.users_projects.count} ) (#{@admin_project.users_projects.count})
%hr %hr
......
...@@ -36,12 +36,12 @@ ...@@ -36,12 +36,12 @@
$(function() { $(function() {
var availableTags = #{@project.heads.map(&:name).to_json}; var availableTags = #{@project.heads.map(&:name).to_json};
$( "#from" ).autocomplete({ $("#from").autocomplete({
source: availableTags, source: availableTags,
minLength: 1 minLength: 1
}); });
$( "#to" ).autocomplete({ $("#to").autocomplete({
source: availableTags, source: availableTags,
minLength: 1 minLength: 1
}); });
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
%span.ico.projects %span.ico.projects
= link_to "Projects" , "#projects", :id => "projects" = link_to "Projects" , "#projects", :id => "projects"
%small %small
( most recent ) (most recent)
%strong.right %strong.right
= link_to projects_path do = link_to projects_path do
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
%h3 %h3
= link_to "Merge Requests" , "#merge_requests", :id => "merge_requests" = link_to "Merge Requests" , "#merge_requests", :id => "merge_requests"
%small ( authored or assigned to you ) %small (authored or assigned to you)
%strong.right %strong.right
= link_to dashboard_merge_requests_path do = link_to dashboard_merge_requests_path do
Visit merge requests page → Visit merge requests page →
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
%div.dashboard_category %div.dashboard_category
%h3 %h3
= link_to "Issues" , "#issues", :id => "issues" = link_to "Issues" , "#issues", :id => "issues"
%small ( assigned to you ) %small (assigned to you)
%strong.right %strong.right
= link_to dashboard_issues_path do = link_to dashboard_issues_path do
Visit issues page → Visit issues page →
......
%h3 %h3
Issues Issues
%small ( assigned to you ) %small (assigned to you)
%br %br
- if @issues.any? - if @issues.any?
......
%h3 %h3
Merge Requests Merge Requests
%small ( authored or assigned to you ) %small (authored or assigned to you)
%br %br
- if @merge_requests.any? - if @merge_requests.any?
......
- if @issue.valid? - if @issue.valid?
:plain :plain
switchFromNewIssue(); switchFromNewIssue();
$("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue} ))}"); $("#issues-table").prepend("#{escape_javascript(render(:partial => 'show', :locals => {:issue => @issue}))}");
$.ajax({type: "GET", url: location.href, dataType: "script"}); $.ajax({type: "GET", url: location.href, dataType: "script"});
- else - else
:plain :plain
......
- if @key.valid? - if @key.valid?
:plain :plain
$("#new_key_dialog").dialog("close"); $("#new_key_dialog").dialog("close");
$("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key} ))}"); $("#keys-table .data").append("#{escape_javascript(render(:partial => 'show', :locals => {:key => @key}))}");
$("#no_ssh_key_defined").hide(); $("#no_ssh_key_defined").hide();
- else - else
:plain :plain
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
}); });
$(document).keypress(function(e) { $(document).keypress(function(e) {
if( $(e.target).is(":input") ) return; if($(e.target).is(":input")) return;
switch(e.which) { switch(e.which) {
case 115: focusSearch(); case 115: focusSearch();
e.preventDefault(); e.preventDefault();
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
.view_file .view_file
.view_file_header .view_file_header
.row .row
.span1.file_icon= image_tag( file.image? ? "file_img.png" : "file_txt.png") .span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
.span2.mode_text= file.mode .span2.mode_text= file.mode
.span7.file_name= name .span7.file_name= name
.span4.right .span4.right
= link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path] ), :class => "right", :target => "_blank" = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
= link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref ), :class => "right", :style => "margin-right:10px;" = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
- if file.text? - if file.text?
.view_file_content .view_file_content
- unless file.empty? - unless file.empty?
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
%img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} %img{ :src => "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
- else - else
%center %center
= link_to blob_project_ref_path(@project, @ref, :path => params[:path] ) do = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do
%div %div
%br %br
= image_tag "download.png", :width => 64 = image_tag "download.png", :width => 64
......
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
%td= i + 1 %td= i + 1
%td %td
= link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id) = link_to wiki_page.created_at.to_s(:short), project_wiki_path(@project, wiki_page, :old_page_id => wiki_page.id)
( (#{time_ago_in_words(wiki_page.created_at)}
= time_ago_in_words(wiki_page.created_at) ago)
ago
)
%td= wiki_page.user.name %td= wiki_page.user.name
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