diff --git a/Gemfile.lock b/Gemfile.lock index bfe8bd1c6..ece5418b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -314,7 +314,7 @@ GEM posix-spawn (0.3.8) protected_attributes (1.0.7) activemodel (>= 4.0.1, < 5.0) - puma (2.8.1) + puma (2.8.2) rack (>= 1.1, < 2.0) pygments.rb (0.5.4) posix-spawn (~> 0.3.6) diff --git a/config/environments/production.rb b/config/environments/production.rb index ff123a3df..ce0b0eebc 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,5 +65,9 @@ Rosa::Application.configure do # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js moment/ru.js) + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + config.assets.css_compressor = :sass + config.eager_load = true end diff --git a/config/environments/staging.rb b/config/environments/staging.rb index f5b7d0681..aee5535d7 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -64,6 +64,10 @@ Rosa::Application.configure do # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) config.assets.precompile += %w(login.css login.js reg_session.css tour.css tour.js gollum/editor/langs/*.js moment/ru.js) + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + config.assets.css_compressor = :sass + config.eager_load = true config.log_redis = true end diff --git a/config/routes.rb b/config/routes.rb index 54e5e8797..d7b4e35d2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -371,7 +371,7 @@ Rosa::Application.routes.draw do # Commit comments post '/commit/:commit_id/comments(.:format)' => "comments#create", as: :project_commit_comments get '/commit/:commit_id/comments/:id(.:format)' => "comments#edit", as: :edit_project_commit_comment - put '/commit/:commit_id/comments/:id(.:format)' => "comments#update", as: :project_commit_comment + patch '/commit/:commit_id/comments/:id(.:format)' => "comments#update", as: :project_commit_comment delete '/commit/:commit_id/comments/:id(.:format)' => "comments#destroy" get '/commit/:commit_id/add_line_comments(.:format)' => "comments#new_line", as: :new_line_commit_comment # Commit subscribes