Download as
Browse Code »

Commit 0903932320073e3e5120faae523e00a94709a95a

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

updated

Showing 4 changed files with 28 additions and 25 deletions   Show diff stats
app/controllers/commits_controller.rb
  Diff comments   View file @0903932
@@ -2,6 +2,7 @@ require "base64" @@ -2,6 +2,7 @@ require "base64"
2 2
3 class CommitsController < ApplicationController 3 class CommitsController < ApplicationController
4 before_filter :project 4 before_filter :project
  5 + layout "project"
5 6
6 # Authorize 7 # Authorize
7 before_filter :add_project_abilities 8 before_filter :add_project_abilities
app/controllers/snippets_controller.rb
  Diff comments   View file @0903932
1 class SnippetsController < ApplicationController 1 class SnippetsController < ApplicationController
2 before_filter :authenticate_user! 2 before_filter :authenticate_user!
3 before_filter :project 3 before_filter :project
  4 + layout "project"
4 5
5 # Authorize 6 # Authorize
6 before_filter :add_project_abilities 7 before_filter :add_project_abilities
app/controllers/team_members_controller.rb
  Diff comments   View file @0903932
1 class TeamMembersController < ApplicationController 1 class TeamMembersController < ApplicationController
2 before_filter :project 2 before_filter :project
  3 + layout "project"
3 4
4 # Authorize 5 # Authorize
5 before_filter :add_project_abilities 6 before_filter :add_project_abilities
app/views/layouts/project.html.haml
  Diff comments   View file @0903932
@@ -14,32 +14,32 @@ @@ -14,32 +14,32 @@
14 #container 14 #container
15 = render :partial => "layouts/flash" 15 = render :partial => "layouts/flash"
16 = render :partial => "layouts/head_panel" 16 = render :partial => "layouts/head_panel"
17 - = render :partial => "layouts/page_title"  
18 .project-container 17 .project-container
19 - .project-sidebar.grid_1  
20 - %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}  
21 - %aside  
22 - = link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil  
23 - = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil  
24 - = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil  
25 - = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do  
26 - Team  
27 - - if @project.users_projects.count > 0  
28 - %span{ :class => "top_menu_count" }= @project.users_projects.count  
29 - = link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do  
30 - Issues  
31 - - if @project.issues.opened.count > 0  
32 - %span{ :class => "top_menu_count" }= @project.issues.opened.count  
33 - = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do  
34 - Wall  
35 - - if @project.common_notes.count > 0  
36 - %span{ :class => "top_menu_count" }= @project.common_notes.count  
37 - = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do  
38 - Snippets  
39 - - if @project.snippets.count > 0  
40 - %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count  
41 - - if @commit  
42 - = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil 18 + .project-sidebar
  19 + .fixed
  20 + %input.git-url.text{:id => "", :name => "", :readonly => "", :type => "text", :value => @project.url_to_repo}
  21 + %aside
  22 + = link_to image_tag("home.png", :width => 20), project_path(@project), :class => current_page?(:controller => "projects", :action => "show", :id => @project) ? "current" : nil
  23 + = link_to "Tree", tree_project_path(@project), :class => current_page?(:controller => "projects", :action => "tree", :id => @project) ? "current" : nil
  24 + = link_to "Commits", project_commits_path(@project), :class => current_page?(:controller => "commits", :action => "index", :project_id => @project) ? "current" : nil
  25 + = link_to team_project_path(@project), :class => (current_page?(:controller => "projects", :action => "team", :id => @project) || controller.controller_name == "team_members") ? "current" : nil do
  26 + Team
  27 + - if @project.users_projects.count > 0
  28 + %span{ :class => "top_menu_count" }= @project.users_projects.count
  29 + = link_to project_issues_path(@project), :class => (controller.controller_name == "issues") ? "current" : nil do
  30 + Issues
  31 + - if @project.issues.opened.count > 0
  32 + %span{ :class => "top_menu_count" }= @project.issues.opened.count
  33 + = link_to wall_project_path(@project), :class => current_page?(:controller => "projects", :action => "wall", :id => @project) ? "current" : nil do
  34 + Wall
  35 + - if @project.common_notes.count > 0
  36 + %span{ :class => "top_menu_count" }= @project.common_notes.count
  37 + = link_to project_snippets_path(@project), :class => (controller.controller_name == "snippets") ? "current" : nil do
  38 + Snippets
  39 + - if @project.snippets.count > 0
  40 + %span{ :class => "top_menu_count" }= @project.snippets.non_expired.count
  41 + - if @commit
  42 + = link_to truncate(commit_name(@project,@commit), :length => 15), project_commit_path(@project, :id => @commit.id), :class => current_page?(:controller => "commits", :action => "show", :project_id => @project, :id => @commit.id) ? "current" : nil
43 43
44 44
45 .project-content 45 .project-content