Merge branch 'develop'

Author: toastercup

Gemfile

@@ -29,7 +29,7 @@ gem 'rolify', '~> 5.1'
 gem 'pundit', '~> 1.1'
 
 # Data
-gem 'rails-observers', git: 'https://github.com/rails/rails-observers.git'
+gem 'rails-observers', git: 'https://github.com/triloch/rails-observers.git'
 gem 'awesome_nested_set', git: 'https://github.com/cortex-cms/awesome_nested_set.git'
 gem 'paperclip', '~> 5.1.0'
 gem 'paperclip-optimizer', '~> 2.0'

Gemfile.lock

@@ -15,13 +15,6 @@ GIT
       cells-rails (~> 0.0.6)
       rails (>= 4)
 
-GIT
-  remote: https://github.com/rails/rails-observers.git
-  revision: 3fe157d6cbb5b5e767ded248009fc59443d63fa1
-  specs:
-    rails-observers (0.1.3.alpha)
-      activemodel (>= 4.0, < 5.1)
-
 GIT
   remote: https://github.com/samstickland/cells.git
   revision: e5634e25b472d41913030eb82463b015f429f2ca
@@ -40,6 +33,13 @@ GIT
       grape
       kaminari
 
+GIT
+  remote: https://github.com/triloch/rails-observers.git
+  revision: ea30390cb07b4a37dd2f9d03966c89c1372f9dbe
+  specs:
+    rails-observers (0.1.3.alpha)
+      activemodel (>= 4.0, < 5.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -465,7 +465,7 @@ GEM
     mime-types-data (3.2016.0521)
     mimemagic (0.3.2)
     mini_portile2 (2.1.0)
-    minitest (5.9.1)
+    minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)

semaphore_ci/setup.sh

@@ -1,9 +1,3 @@
-echo "gem update --system"
-gem update --system
-
-echo "gem update bundler"
-gem update bundler
-
 echo "bundle config build.nokogiri --use-system-libraries"
 bundle config build.nokogiri --use-system-libraries
 
@@ -33,3 +27,6 @@ bundle exec rake cortex:create_categories cortex:onet:fetch_and_provision cortex
 
 echo "bundle exec rake cortex:rebuild_indexes"
 bundle exec rake cortex:rebuild_indexes
+
+echo "change-phantomjs-version 2.1.1"
+change-phantomjs-version 2.1.1