Download as
Browse Code »

Commit 97cf5659aaee3083925fa4f8d30efddb9becd271

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

fixed layout as default

Showing 2 changed files with 6 additions and 6 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @97cf565
@@ -80,13 +80,13 @@ class ApplicationController < ActionController::Base @@ -80,13 +80,13 @@ class ApplicationController < ActionController::Base
80 if params[:view_style] == "collapsed" 80 if params[:view_style] == "collapsed"
81 cookies[:view_style] = "collapsed" 81 cookies[:view_style] = "collapsed"
82 elsif params[:view_style] == "fluid" 82 elsif params[:view_style] == "fluid"
83 - cookies[:view_style] = "" 83 + cookies[:view_style] = "fluid"
84 end 84 end
85 85
86 - @view_mode = if cookies[:view_style] == "collapsed"  
87 - :fixed  
88 - else 86 + @view_mode = if cookies[:view_style] == "fluid"
89 :fluid 87 :fluid
  88 + else
  89 + :collapsed
90 end 90 end
91 end 91 end
92 92
app/helpers/application_helper.rb
  Diff comments   View file @97cf565
@@ -7,7 +7,7 @@ module ApplicationHelper @@ -7,7 +7,7 @@ module ApplicationHelper
7 end 7 end
8 8
9 def fixed_mode? 9 def fixed_mode?
10 - @view_mode == :fixed 10 + @view_mode == :fluid
11 end 11 end
12 12
13 def body_class(default_class = nil) 13 def body_class(default_class = nil)
@@ -15,7 +15,7 @@ module ApplicationHelper @@ -15,7 +15,7 @@ module ApplicationHelper
15 default_class : 15 default_class :
16 content_for(:body_class) 16 content_for(:body_class)
17 17
18 - [main, cookies[:view_style]].join(" ") 18 + [main, @view_mode].join(" ")
19 end 19 end
20 20
21 def commit_name(project, commit) 21 def commit_name(project, commit)