diff --git a/Gemfile b/Gemfile index 3edb5c9..f3f0018 100644 --- a/Gemfile +++ b/Gemfile @@ -22,7 +22,7 @@ gem 'sass-rails', '~> 5.0' # Use Devise for authentication gem 'devise' # Use Uglifier as compressor for JavaScript assets -gem 'uglifier', '>= 1.3.0' +gem 'uglifier', '~> 4.2', '>= 4.2.1' # See https://github.com/rails/execjs#readme for more supported runtimes # gem 'mini_racer', platforms: :ruby # Use CoffeeScript for .coffee assets and views diff --git a/Gemfile.lock b/Gemfile.lock index 099d7cc..fc5b60a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -449,7 +449,7 @@ DEPENDENCIES sqlite3 (~> 1.4) turbolinks (~> 5) tzinfo-data - uglifier (>= 1.3.0) + uglifier (~> 4.2, >= 4.2.1) web-console (>= 3.3.0) RUBY VERSION diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b909f6c..a447c5a 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,7 +12,7 @@ // //= require rails-ujs //= require jquery3 -//= require bootstrap-sprockets +//= require bootstrap //= require gritter //= require activestorage //= require turbolinks diff --git a/app/views/front/dashboard.html.erb b/app/views/front/dashboard.html.erb index 43cb451..089255f 100644 --- a/app/views/front/dashboard.html.erb +++ b/app/views/front/dashboard.html.erb @@ -6,7 +6,7 @@
<% if @indesign_count != 0 %> - +
-
<%= sortable "title", "Software Record" %> @@ -28,7 +28,7 @@ <% end %> Status<%= sortable "production_url", "URL" %> + <%= sortable "production_url", "URL" %> <% if params[:direction] == "asc" || params[:direction] == nil %> <% else %> diff --git a/config/deploy.rb b/config/deploy.rb index 13722a8..bcb0b14 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -62,7 +62,7 @@ WARN ask :value, "Sure you want to continue deploying `#{branch}` on #{stage}? (Y)" - if fetch(:value) != 'Y' + if fetch(:value).to_s.downcase != 'y' puts "\nDeploy cancelled!" exit end diff --git a/config/environments/production.rb b/config/environments/production.rb index 7d6f22b..708307c 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -112,5 +112,19 @@ config.active_record.dump_schema_after_migration = false # Change the Uglifier parsing engine - config.assets.js_compressor = Uglifier.new(harmony: true) + config.assets.js_compressor = Uglifier.new( + harmony: true, + mangle: false, + compress: false, + output: { + beautify: true, + comments: :all + } + ) + + + + + + end