Download as
Browse Code »

Commit f026abd8d509c654278bbe806db2ff4a6427d5ad

Authored by Diego Camarinha
2 parents aaac51a1 ed542eec
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

Merge pull request #187 from mezuro/updates 

Updates
Showing 11 changed files with 75 additions and 83 deletions   Show diff stats
1 language: ruby 1 language: ruby
2 rvm: 2 rvm:
3 - - 2.2.0 3 + - 2.2.1
4 4
5 before_script: 5 before_script:
6 - git clone https://gist.github.com/6179925.git -b v2.0 kalibro_install 6 - git clone https://gist.github.com/6179925.git -b v2.0 kalibro_install
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' 3 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4 -gem 'rails', '4.2.0' 4 +gem 'rails', '4.2.1'
5 5
6 # Use sqlite3 as the database for Active Record 6 # Use sqlite3 as the database for Active Record
7 gem 'sqlite3' 7 gem 'sqlite3'
@@ -78,10 +78,10 @@ group :test do @@ -78,10 +78,10 @@ group :test do
78 end 78 end
79 79
80 group :development, :test do 80 group :development, :test do
81 - # Call 'debugger' anywhere in the code to stop execution and get a debugger console 81 + # Call 'byebug' anywhere in the code to stop execution and get a debugger console
82 gem 'byebug' 82 gem 'byebug'
83 83
84 - # Access an IRB console on exceptions page and /console in development 84 + # Access an IRB console on exception pages or by using <%= console %> in views
85 gem 'web-console', '~> 2.0.0' 85 gem 'web-console', '~> 2.0.0'
86 86
87 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring 87 # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
@@ -94,7 +94,7 @@ group :development, :test do @@ -94,7 +94,7 @@ group :development, :test do
94 gem 'factory_girl_rails', '~> 4.5.0' 94 gem 'factory_girl_rails', '~> 4.5.0'
95 95
96 # Deployment 96 # Deployment
97 - gem 'capistrano', "~>3.3.3", require: false 97 + gem 'capistrano', "~>3.4.0", require: false
98 gem 'capistrano-rails' 98 gem 'capistrano-rails'
99 gem 'capistrano-bundler' 99 gem 'capistrano-bundler'
100 gem 'capistrano-rvm', "~>0.1.0" 100 gem 'capistrano-rvm', "~>0.1.0"
@@ -111,9 +111,9 @@ end @@ -111,9 +111,9 @@ end
111 group :cucumber do 111 group :cucumber do
112 gem 'cucumber-rails', '~> 1.4.0' 112 gem 'cucumber-rails', '~> 1.4.0'
113 # cleans the database 113 # cleans the database
114 - # Version fixed at 1.3. See: 114 + # Version must be grater than 1.4.1. See:
115 # https://github.com/DatabaseCleaner/database_cleaner/issues/317 115 # https://github.com/DatabaseCleaner/database_cleaner/issues/317
116 - gem 'database_cleaner', '~> 1.3.0' 116 + gem 'database_cleaner', '~> 1.4.1'
117 gem 'poltergeist', '~> 1.6.0' 117 gem 'poltergeist', '~> 1.6.0'
118 end 118 end
119 119
@@ -12,36 +12,36 @@ GIT @@ -12,36 +12,36 @@ GIT
12 GEM 12 GEM
13 remote: https://rubygems.org/ 13 remote: https://rubygems.org/
14 specs: 14 specs:
15 - actionmailer (4.2.0)  
16 - actionpack (= 4.2.0)  
17 - actionview (= 4.2.0)  
18 - activejob (= 4.2.0) 15 + actionmailer (4.2.1)
  16 + actionpack (= 4.2.1)
  17 + actionview (= 4.2.1)
  18 + activejob (= 4.2.1)
19 mail (~> 2.5, >= 2.5.4) 19 mail (~> 2.5, >= 2.5.4)
20 rails-dom-testing (~> 1.0, >= 1.0.5) 20 rails-dom-testing (~> 1.0, >= 1.0.5)
21 - actionpack (4.2.0)  
22 - actionview (= 4.2.0)  
23 - activesupport (= 4.2.0)  
24 - rack (~> 1.6.0) 21 + actionpack (4.2.1)
  22 + actionview (= 4.2.1)
  23 + activesupport (= 4.2.1)
  24 + rack (~> 1.6)
25 rack-test (~> 0.6.2) 25 rack-test (~> 0.6.2)
26 rails-dom-testing (~> 1.0, >= 1.0.5) 26 rails-dom-testing (~> 1.0, >= 1.0.5)
27 rails-html-sanitizer (~> 1.0, >= 1.0.1) 27 rails-html-sanitizer (~> 1.0, >= 1.0.1)
28 - actionview (4.2.0)  
29 - activesupport (= 4.2.0) 28 + actionview (4.2.1)
  29 + activesupport (= 4.2.1)
30 builder (~> 3.1) 30 builder (~> 3.1)
31 erubis (~> 2.7.0) 31 erubis (~> 2.7.0)
32 rails-dom-testing (~> 1.0, >= 1.0.5) 32 rails-dom-testing (~> 1.0, >= 1.0.5)
33 rails-html-sanitizer (~> 1.0, >= 1.0.1) 33 rails-html-sanitizer (~> 1.0, >= 1.0.1)
34 - activejob (4.2.0)  
35 - activesupport (= 4.2.0) 34 + activejob (4.2.1)
  35 + activesupport (= 4.2.1)
36 globalid (>= 0.3.0) 36 globalid (>= 0.3.0)
37 - activemodel (4.2.0)  
38 - activesupport (= 4.2.0) 37 + activemodel (4.2.1)
  38 + activesupport (= 4.2.1)
39 builder (~> 3.1) 39 builder (~> 3.1)
40 - activerecord (4.2.0)  
41 - activemodel (= 4.2.0)  
42 - activesupport (= 4.2.0) 40 + activerecord (4.2.1)
  41 + activemodel (= 4.2.1)
  42 + activesupport (= 4.2.1)
43 arel (~> 6.0) 43 arel (~> 6.0)
44 - activesupport (4.2.0) 44 + activesupport (4.2.1)
45 i18n (~> 0.7) 45 i18n (~> 0.7)
46 json (~> 1.7, >= 1.7.7) 46 json (~> 1.7, >= 1.7.7)
47 minitest (~> 5.1) 47 minitest (~> 5.1)
@@ -56,12 +56,9 @@ GEM @@ -56,12 +56,9 @@ GEM
56 binding_of_caller (0.7.2) 56 binding_of_caller (0.7.2)
57 debug_inspector (>= 0.0.1) 57 debug_inspector (>= 0.0.1)
58 builder (3.2.2) 58 builder (3.2.2)
59 - byebug (3.5.1)  
60 - columnize (~> 0.8)  
61 - debugger-linecache (~> 1.2)  
62 - slop (~> 3.6)  
63 - capistrano (3.3.5)  
64 - capistrano-stats (~> 1.1.0) 59 + byebug (4.0.3)
  60 + columnize (= 0.9.0)
  61 + capistrano (3.4.0)
65 i18n 62 i18n
66 rake (>= 10.0.0) 63 rake (>= 10.0.0)
67 sshkit (~> 1.3) 64 sshkit (~> 1.3)
@@ -74,7 +71,6 @@ GEM @@ -74,7 +71,6 @@ GEM
74 capistrano-rvm (0.1.2) 71 capistrano-rvm (0.1.2)
75 capistrano (~> 3.0) 72 capistrano (~> 3.0)
76 sshkit (~> 1.2) 73 sshkit (~> 1.2)
77 - capistrano-stats (1.1.1)  
78 capybara (2.4.4) 74 capybara (2.4.4)
79 mime-types (>= 1.16) 75 mime-types (>= 1.16)
80 nokogiri (>= 1.3.3) 76 nokogiri (>= 1.3.3)
@@ -84,7 +80,7 @@ GEM @@ -84,7 +80,7 @@ GEM
84 chart-js-rails (0.0.8) 80 chart-js-rails (0.0.8)
85 railties (> 3.1) 81 railties (> 3.1)
86 cliver (0.3.2) 82 cliver (0.3.2)
87 - codeclimate-test-reporter (0.4.6) 83 + codeclimate-test-reporter (0.4.7)
88 simplecov (>= 0.7.1, < 1.0.0) 84 simplecov (>= 0.7.1, < 1.0.0)
89 coderay (1.1.0) 85 coderay (1.1.0)
90 coffee-rails (4.1.0) 86 coffee-rails (4.1.0)
@@ -110,10 +106,9 @@ GEM @@ -110,10 +106,9 @@ GEM
110 mime-types (>= 1.16, < 3) 106 mime-types (>= 1.16, < 3)
111 nokogiri (~> 1.5) 107 nokogiri (~> 1.5)
112 rails (>= 3, < 5) 108 rails (>= 3, < 5)
113 - dalli (2.7.2)  
114 - database_cleaner (1.3.0) 109 + dalli (2.7.4)
  110 + database_cleaner (1.4.1)
115 debug_inspector (0.0.2) 111 debug_inspector (0.0.2)
116 - debugger-linecache (1.2.0)  
117 devise (3.4.1) 112 devise (3.4.1)
118 bcrypt (~> 3.0) 113 bcrypt (~> 3.0)
119 orm_adapter (~> 0.1) 114 orm_adapter (~> 0.1)
@@ -127,7 +122,7 @@ GEM @@ -127,7 +122,7 @@ GEM
127 exception_notification (4.0.1) 122 exception_notification (4.0.1)
128 actionmailer (>= 3.0.4) 123 actionmailer (>= 3.0.4)
129 activesupport (>= 3.0.4) 124 activesupport (>= 3.0.4)
130 - execjs (2.3.0) 125 + execjs (2.4.0)
131 factory_girl (4.5.0) 126 factory_girl (4.5.0)
132 activesupport (>= 3.0.0) 127 activesupport (>= 3.0.0)
133 factory_girl_rails (4.5.0) 128 factory_girl_rails (4.5.0)
@@ -144,7 +139,7 @@ GEM @@ -144,7 +139,7 @@ GEM
144 google-analytics-rails (0.0.6) 139 google-analytics-rails (0.0.6)
145 hike (1.2.3) 140 hike (1.2.3)
146 i18n (0.7.0) 141 i18n (0.7.0)
147 - jbuilder (2.2.8) 142 + jbuilder (2.2.12)
148 activesupport (>= 3.0.0, < 5) 143 activesupport (>= 3.0.0, < 5)
149 multi_json (~> 1.2) 144 multi_json (~> 1.2)
150 jquery-rails (4.0.3) 145 jquery-rails (4.0.3)
@@ -179,7 +174,7 @@ GEM @@ -179,7 +174,7 @@ GEM
179 minitest (5.5.1) 174 minitest (5.5.1)
180 mocha (1.1.0) 175 mocha (1.1.0)
181 metaclass (~> 0.0.1) 176 metaclass (~> 0.0.1)
182 - multi_json (1.10.1) 177 + multi_json (1.11.0)
183 multi_test (0.1.2) 178 multi_test (0.1.2)
184 multipart-post (2.0.0) 179 multipart-post (2.0.0)
185 net-scp (1.2.1) 180 net-scp (1.2.1)
@@ -197,28 +192,28 @@ GEM @@ -197,28 +192,28 @@ GEM
197 rack (1.6.0) 192 rack (1.6.0)
198 rack-test (0.6.3) 193 rack-test (0.6.3)
199 rack (>= 1.0) 194 rack (>= 1.0)
200 - rails (4.2.0)  
201 - actionmailer (= 4.2.0)  
202 - actionpack (= 4.2.0)  
203 - actionview (= 4.2.0)  
204 - activejob (= 4.2.0)  
205 - activemodel (= 4.2.0)  
206 - activerecord (= 4.2.0)  
207 - activesupport (= 4.2.0) 195 + rails (4.2.1)
  196 + actionmailer (= 4.2.1)
  197 + actionpack (= 4.2.1)
  198 + actionview (= 4.2.1)
  199 + activejob (= 4.2.1)
  200 + activemodel (= 4.2.1)
  201 + activerecord (= 4.2.1)
  202 + activesupport (= 4.2.1)
208 bundler (>= 1.3.0, < 2.0) 203 bundler (>= 1.3.0, < 2.0)
209 - railties (= 4.2.0) 204 + railties (= 4.2.1)
210 sprockets-rails 205 sprockets-rails
211 rails-deprecated_sanitizer (1.0.3) 206 rails-deprecated_sanitizer (1.0.3)
212 activesupport (>= 4.2.0.alpha) 207 activesupport (>= 4.2.0.alpha)
213 - rails-dom-testing (1.0.5) 208 + rails-dom-testing (1.0.6)
214 activesupport (>= 4.2.0.beta, < 5.0) 209 activesupport (>= 4.2.0.beta, < 5.0)
215 nokogiri (~> 1.6.0) 210 nokogiri (~> 1.6.0)
216 rails-deprecated_sanitizer (>= 1.0.1) 211 rails-deprecated_sanitizer (>= 1.0.1)
217 - rails-html-sanitizer (1.0.1) 212 + rails-html-sanitizer (1.0.2)
218 loofah (~> 2.0) 213 loofah (~> 2.0)
219 - railties (4.2.0)  
220 - actionpack (= 4.2.0)  
221 - activesupport (= 4.2.0) 214 + railties (4.2.1)
  215 + actionpack (= 4.2.1)
  216 + activesupport (= 4.2.1)
222 rake (>= 0.8.7) 217 rake (>= 0.8.7)
223 thor (>= 0.18.1, < 2.0) 218 thor (>= 0.18.1, < 2.0)
224 rake (10.4.2) 219 rake (10.4.2)
@@ -226,7 +221,7 @@ GEM @@ -226,7 +221,7 @@ GEM
226 ref (1.0.5) 221 ref (1.0.5)
227 responders (2.1.0) 222 responders (2.1.0)
228 railties (>= 4.2.0, < 5) 223 railties (>= 4.2.0, < 5)
229 - rspec-core (3.2.1) 224 + rspec-core (3.2.2)
230 rspec-support (~> 3.2.0) 225 rspec-support (~> 3.2.0)
231 rspec-expectations (3.2.0) 226 rspec-expectations (3.2.0)
232 diff-lcs (>= 1.2.0, < 2.0) 227 diff-lcs (>= 1.2.0, < 2.0)
@@ -243,7 +238,7 @@ GEM @@ -243,7 +238,7 @@ GEM
243 rspec-mocks (~> 3.2.0) 238 rspec-mocks (~> 3.2.0)
244 rspec-support (~> 3.2.0) 239 rspec-support (~> 3.2.0)
245 rspec-support (3.2.2) 240 rspec-support (3.2.2)
246 - sass (3.4.12) 241 + sass (3.4.13)
247 sass-rails (5.0.1) 242 sass-rails (5.0.1)
248 railties (>= 4.0.0, < 5.0) 243 railties (>= 4.0.0, < 5.0)
249 sass (~> 3.1) 244 sass (~> 3.1)
@@ -260,8 +255,7 @@ GEM @@ -260,8 +255,7 @@ GEM
260 multi_json (~> 1.0) 255 multi_json (~> 1.0)
261 simplecov-html (~> 0.9.0) 256 simplecov-html (~> 0.9.0)
262 simplecov-html (0.9.0) 257 simplecov-html (0.9.0)
263 - slop (3.6.0)  
264 - spring (1.3.2) 258 + spring (1.3.3)
265 sprockets (2.12.3) 259 sprockets (2.12.3)
266 hike (~> 1.2) 260 hike (~> 1.2)
267 multi_json (~> 1.0) 261 multi_json (~> 1.0)
@@ -272,7 +266,7 @@ GEM @@ -272,7 +266,7 @@ GEM
272 activesupport (>= 3.0) 266 activesupport (>= 3.0)
273 sprockets (>= 2.8, < 4.0) 267 sprockets (>= 2.8, < 4.0)
274 sqlite3 (1.3.10) 268 sqlite3 (1.3.10)
275 - sshkit (1.6.1) 269 + sshkit (1.7.1)
276 colorize (>= 0.7.0) 270 colorize (>= 0.7.0)
277 net-scp (>= 1.1.2) 271 net-scp (>= 1.1.2)
278 net-ssh (>= 2.8.0) 272 net-ssh (>= 2.8.0)
@@ -280,13 +274,13 @@ GEM @@ -280,13 +274,13 @@ GEM
280 libv8 (~> 3.16.14.0) 274 libv8 (~> 3.16.14.0)
281 ref 275 ref
282 thor (0.19.1) 276 thor (0.19.1)
283 - thread_safe (0.3.4) 277 + thread_safe (0.3.5)
284 tilt (1.4.1) 278 tilt (1.4.1)
285 turbolinks (2.5.3) 279 turbolinks (2.5.3)
286 coffee-rails 280 coffee-rails
287 tzinfo (1.2.2) 281 tzinfo (1.2.2)
288 thread_safe (~> 0.1) 282 thread_safe (~> 0.1)
289 - uglifier (2.7.0) 283 + uglifier (2.7.1)
290 execjs (>= 0.3.0) 284 execjs (>= 0.3.0)
291 json (>= 1.8.0) 285 json (>= 1.8.0)
292 warden (1.2.3) 286 warden (1.2.3)
@@ -309,7 +303,7 @@ DEPENDENCIES @@ -309,7 +303,7 @@ DEPENDENCIES
309 better_errors 303 better_errors
310 binding_of_caller 304 binding_of_caller
311 byebug 305 byebug
312 - capistrano (~> 3.3.3) 306 + capistrano (~> 3.4.0)
313 capistrano-bundler 307 capistrano-bundler
314 capistrano-rails 308 capistrano-rails
315 capistrano-rvm (~> 0.1.0) 309 capistrano-rvm (~> 0.1.0)
@@ -319,7 +313,7 @@ DEPENDENCIES @@ -319,7 +313,7 @@ DEPENDENCIES
319 colorpicker (~> 0.0.5) 313 colorpicker (~> 0.0.5)
320 cucumber-rails (~> 1.4.0) 314 cucumber-rails (~> 1.4.0)
321 dalli (~> 2.7.0) 315 dalli (~> 2.7.0)
322 - database_cleaner (~> 1.3.0) 316 + database_cleaner (~> 1.4.1)
323 devise (~> 3.4.0) 317 devise (~> 3.4.0)
324 exception_notification (~> 4.0.1) 318 exception_notification (~> 4.0.1)
325 factory_girl_rails (~> 4.5.0) 319 factory_girl_rails (~> 4.5.0)
@@ -332,7 +326,7 @@ DEPENDENCIES @@ -332,7 +326,7 @@ DEPENDENCIES
332 mocha 326 mocha
333 pg (~> 0.18.1) 327 pg (~> 0.18.1)
334 poltergeist (~> 1.6.0) 328 poltergeist (~> 1.6.0)
335 - rails (= 4.2.0) 329 + rails (= 4.2.1)
336 rails-html-sanitizer (~> 1.0) 330 rails-html-sanitizer (~> 1.0)
337 rspec-rails (~> 3.2.0) 331 rspec-rails (~> 3.2.0)
338 sass-rails (~> 5.0.0) 332 sass-rails (~> 5.0.0)
app/assets/javascripts/application.js
  Diff comments   View file @f026abd
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 // listed below. 2 // listed below.
3 // 3 //
4 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, 4 // Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
5 -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. 5 +// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
6 // 6 //
7 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the 7 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
8 // compiled file. 8 // compiled file.
app/assets/stylesheets/application.css
  Diff comments   View file @f026abd
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 * listed below. 3 * listed below.
4 * 4 *
5 * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, 5 * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
6 - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. 6 + * or any plugin's vendor/assets/stylesheets directory can be referenced here using a relative path.
7 * 7 *
8 * You're free to add application-wide styles to this file and they'll appear at the bottom of the 8 * You're free to add application-wide styles to this file and they'll appear at the bottom of the
9 * compiled file so the styles you add here take precedence over styles defined in any styles 9 * compiled file so the styles you add here take precedence over styles defined in any styles
1 #!/usr/bin/env ruby 1 #!/usr/bin/env ruby
2 2
3 -# This file loads spring without using Bundler, in order to be fast  
4 -# It gets overwritten when you run the `spring binstub` command 3 +# This file loads spring without using Bundler, in order to be fast.
  4 +# It gets overwritten when you run the `spring binstub` command.
5 5
6 unless defined?(Spring) 6 unless defined?(Spring)
7 require "rubygems" 7 require "rubygems"
8 require "bundler" 8 require "bundler"
9 9
10 - if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ spring \((.*?)\)$.*?^$/m)  
11 - ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)  
12 - ENV["GEM_HOME"] = ""  
13 - Gem.paths = ENV  
14 - 10 + if match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m)
  11 + Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
15 gem "spring", match[1] 12 gem "spring", match[1]
16 require "spring/binstub" 13 require "spring/binstub"
17 end 14 end
1 # This file is used by Rack-based servers to start the application. 1 # This file is used by Rack-based servers to start the application.
2 2
3 -require ::File.expand_path('../config/environment', __FILE__) 3 +require ::File.expand_path('../config/environment', __FILE__)
4 run Rails.application 4 run Rails.application
config/application.rb
  Diff comments   View file @f026abd
@@ -21,7 +21,7 @@ module Mezuro @@ -21,7 +21,7 @@ module Mezuro
21 # config.i18n.default_locale = :de 21 # config.i18n.default_locale = :de
22 config.i18n.enforce_available_locales = true 22 config.i18n.enforce_available_locales = true
23 23
24 - # For not swallow errors in after_commit/after_rollback callbacks. 24 + # Do not swallow errors in after_commit/after_rollback callbacks.
25 config.active_record.raise_in_transactional_callbacks = true 25 config.active_record.raise_in_transactional_callbacks = true
26 end 26 end
27 end 27 end
config/boot.rb
  Diff comments   View file @f026abd
1 -# Set up gems listed in the Gemfile.  
2 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
3 2
4 require 'bundler/setup' # Set up gems listed in the Gemfile 3 require 'bundler/setup' # Set up gems listed in the Gemfile
config/environments/production.rb
  Diff comments   View file @f026abd
@@ -16,11 +16,12 @@ Rails.application.configure do @@ -16,11 +16,12 @@ Rails.application.configure do
16 16
17 # Enable Rack::Cache to put a simple HTTP cache in front of your application 17 # Enable Rack::Cache to put a simple HTTP cache in front of your application
18 # Add `rack-cache` to your Gemfile before enabling this. 18 # Add `rack-cache` to your Gemfile before enabling this.
19 - # For large-scale production use, consider using a caching reverse proxy like NGINX, varnish or squid.  
20 - # config.action_dispatch.rack_cache = true 19 + # For large-scale production use, consider using a caching reverse proxy like
  20 + # NGINX, varnish or squid.
21 21
22 - # Disable Rails's static asset server (Apache or NGINX will already do this).  
23 - config.serve_static_files = false 22 + # Disable serving static files from the `/public` folder by default since
  23 + # Apache or NGINX already handles this.
  24 + config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
24 25
25 # Compress JavaScripts and CSS. 26 # Compress JavaScripts and CSS.
26 config.assets.js_compressor = :uglifier 27 config.assets.js_compressor = :uglifier
@@ -42,8 +43,9 @@ Rails.application.configure do @@ -42,8 +43,9 @@ Rails.application.configure do
42 # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. 43 # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
43 # config.force_ssl = true 44 # config.force_ssl = true
44 45
45 - # Decrease the log volume.  
46 - config.log_level = :info 46 + # Use the lowest log level to ensure availability of diagnostic information
  47 + # when problems arise.
  48 + config.log_level = :debug
47 49
48 # Prepend all log lines with the following tags. 50 # Prepend all log lines with the following tags.
49 # config.log_tags = [ :subdomain, :uuid ] 51 # config.log_tags = [ :subdomain, :uuid ]
@@ -55,7 +57,7 @@ Rails.application.configure do @@ -55,7 +57,7 @@ Rails.application.configure do
55 config.cache_store = :mem_cache_store, "10.2.2.21", {expires_in: 1.day} 57 config.cache_store = :mem_cache_store, "10.2.2.21", {expires_in: 1.day}
56 58
57 # Enable serving of images, stylesheets, and JavaScripts from an asset server. 59 # Enable serving of images, stylesheets, and JavaScripts from an asset server.
58 - # config.action_controller.asset_host = "http://assets.example.com" 60 + # config.action_controller.asset_host = 'http://assets.example.com'
59 61
60 # Ignore bad email addresses and do not raise email delivery errors. 62 # Ignore bad email addresses and do not raise email delivery errors.
61 # Set this to true and configure the email server for immediate delivery to raise delivery errors. 63 # Set this to true and configure the email server for immediate delivery to raise delivery errors.
config/environments/test.rb
  Diff comments   View file @f026abd
@@ -12,7 +12,7 @@ Rails.application.configure do @@ -12,7 +12,7 @@ Rails.application.configure do
12 # preloads Rails for running tests, you may have to set it to true. 12 # preloads Rails for running tests, you may have to set it to true.
13 config.eager_load = false 13 config.eager_load = false
14 14
15 - # Configure static asset server for tests with Cache-Control for performance. 15 + # Configure static file server for tests with Cache-Control for performance.
16 config.serve_static_files = true 16 config.serve_static_files = true
17 config.static_cache_control = 'public, max-age=3600' 17 config.static_cache_control = 'public, max-age=3600'
18 18