aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--Gemfile.lock26
-rw-r--r--Vagrantfile2
-rw-r--r--app/assets/javascripts/application.js2
-rw-r--r--config/environments/staging.rb2
5 files changed, 19 insertions, 17 deletions
diff --git a/Gemfile b/Gemfile
index 0724c02..9937604 100644
--- a/Gemfile
+++ b/Gemfile
@@ -59,8 +59,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 b833fe5..88c405a 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)
@@ -75,7 +75,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)
@@ -90,7 +90,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)
@@ -98,7 +98,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)
@@ -108,7 +108,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)
@@ -151,8 +151,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)
@@ -257,19 +257,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)
diff --git a/Vagrantfile b/Vagrantfile
index e54619d..c6f0614 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -14,7 +14,7 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
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"
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 .
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