From 659d8371ac28e80dfd83c33c71236d36a6a7bb6b Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 30 Nov 2018 13:27:39 +0100 Subject: Upgrade Vagrant env to FreeBSD 11.2 --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 1d45650..11e9b39 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -14,7 +14,7 @@ # along with this program. If not, see . Vagrant.configure("2") do |config| - config.vm.box = "bento/freebsd-10.4" + config.vm.box = "bento/freebsd-11.2" config.vm.guest = :freebsd config.vm.network :forwarded_port, host: 3000, guest: 3000 config.vm.provision :shell, :path => "vagrant/bootstrap.sh" -- cgit v1.2.3 From 92c111e05d045891ec5a37d847e8144559cbdf72 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 30 Nov 2018 13:28:34 +0100 Subject: Include banners/*.js in application.js. Attempt to fix issue with the js files not being precompiled in production. --- app/assets/javascripts/application.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 9097d83..0a7cfbd 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,4 +12,6 @@ // //= require jquery //= require jquery_ujs +//= require banners/banners +//= require banners/jquery.tristate //= require_tree . -- cgit v1.2.3 From 7a35c5efadf0e1d6ec91dcc023cac5712139da14 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 30 Nov 2018 19:59:33 +0100 Subject: Don't fall back to compiling assets in staging. This makes staging behave like production, so that we discover issues with missing precompiled assets before prod. --- config/environments/staging.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/environments/staging.rb b/config/environments/staging.rb index 65c0e3c..c852a5c 100644 --- a/config/environments/staging.rb +++ b/config/environments/staging.rb @@ -15,7 +15,7 @@ BetaWebApp::Application.configure do config.assets.compress = true # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = true + config.assets.compile = false # Generate digests for assets URLs config.assets.digest = true -- cgit v1.2.3 From dfda701bc2a3ebb35beb6177bce8f7a1bf6155da Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Fri, 30 Nov 2018 20:46:39 +0100 Subject: Update banners and other deps. --- Gemfile | 4 ++-- Gemfile.lock | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 65b78ad..aaba4fe 100644 --- a/Gemfile +++ b/Gemfile @@ -57,8 +57,8 @@ gem 'refinerycms-search', '~> 2.1.0' gem 'refinerycms-page-images', '~> 2.1.0' gem 'refinerycms-videojs' gem 'refinerycms-pc_banners', - :git => "https://github.com/DriesS/refinerycms-pc_banners.git", - :branch => "2-1-stable" + :git => "https://code.volse.no/refinerycms-pc_banners.git", + :branch => "2-1-stable-for-hmno" gem 'refinerycms-gallery_links', :path => 'vendor/extensions' gem 'refinerycms-acts-as-indexed', diff --git a/Gemfile.lock b/Gemfile.lock index cef8b81..38df05d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GIT - remote: https://github.com/DriesS/refinerycms-pc_banners.git - revision: 05d5475264f0b666ef3e9ea0f29c0d3b42522d43 - branch: 2-1-stable + remote: https://code.volse.no/refinerycms-pc_banners.git + revision: d8e816c02d61378e30ff5a2bb7c0b1e8f2ce98cc + branch: 2-1-stable-for-hmno specs: refinerycms-pc_banners (2.0.2) refinerycms-pages (~> 2.1.0) @@ -69,7 +69,7 @@ GEM acts-as-taggable-on (2.4.1) rails (>= 3, < 5) acts_as_indexed (0.8.3) - airbrussh (1.3.0) + airbrussh (1.3.1) sshkit (>= 1.6.1, != 1.7.0) arel (3.0.3) awesome_nested_set (2.1.6) @@ -83,7 +83,7 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (1.4.0) capistrano (~> 3.1) sshkit (~> 1.2) capistrano-postgresql (4.7.0) @@ -91,7 +91,7 @@ GEM capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano-rbenv (2.1.3) + capistrano-rbenv (2.1.4) capistrano (~> 3.1) sshkit (~> 1.3) coffee-rails (3.2.2) @@ -101,7 +101,7 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.3) decorators (1.0.5) railties (>= 3.0.19) devise (2.2.8) @@ -144,8 +144,8 @@ GEM activesupport rails (>= 3.0.0) polyglot (0.3.5) - power_assert (1.1.2) - puma (3.11.4) + power_assert (1.1.3) + puma (3.12.0) rack (1.4.7) rack-cache (1.8.0) rack (>= 0.4) @@ -250,19 +250,19 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.13) - sshkit (1.16.1) + sshkit (1.18.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) test-unit (3.2.8) power_assert - thor (0.20.0) + thor (0.20.3) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) truncate_html (0.9.3) - tzinfo (0.3.54) - uglifier (4.1.12) + tzinfo (0.3.55) + uglifier (4.1.20) execjs (>= 0.3.0, < 3) warden (1.2.7) rack (>= 1.0) @@ -307,4 +307,4 @@ DEPENDENCIES uglifier (>= 1.0.3) BUNDLED WITH - 1.16.4 + 1.17.1 -- cgit v1.2.3 From 5a6460a6101819cc7834612649b48961f5d16d20 Mon Sep 17 00:00:00 2001 From: Harald Eilertsen Date: Sat, 11 May 2019 18:59:01 +0200 Subject: Update deploy script lock. --- config/deploy.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/deploy.rb b/config/deploy.rb index f4b1fd9..ce1e0f0 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -lock '3.10.1' +lock '3.10.2' set :application, 'hmno' set :repo_url, 'http://code.volse.no/hmnoweb.git' -- cgit v1.2.3