locomotivecms 3.2.1 → 3.3.0.rc1

data/lib/locomotive/configuration.rb

@@ -1,7 +1,7 @@
 module Locomotive
   class Configuration
 
-    @@default_locales = %w{en de fr pl pt pt-BR it nl nb es ru et lt ja zh-CN cs bg sk sr sv}
+    @@default_locales = %w{en de fr bg ca cs da el es et fa-IR fi-FI it ja-JP lt nb nl pl-PL pt pt-BR ru sk sr sv sv-FI uk zh-CN}
 
     @@defaults = {
       name:                         'Locomotive',

data/lib/locomotive/dragonfly.rb

@@ -25,7 +25,7 @@ module Locomotive
       if source.is_a?(String) || source.is_a?(Hash) # simple string or drop
         source = source['url'] if source.is_a?(Hash)
 
-        clean_source!(source)
+        source = clean_source(source)
 
         if source =~ /^http/
           file = self.app.fetch_url(source)
@@ -50,12 +50,14 @@ module Locomotive
 
     protected
 
-    def self.clean_source!(source)
+    def self.clean_source(source)
       # remove the leading / trailing whitespaces
-      source.strip!
+      _source = source.strip
 
       # remove the query part (usually, timestamp) if local file
-      source.sub!(/(\?.*)$/, '') unless source =~ /^http/
+      _source = _source.sub(/(\?.*)$/, '') unless _source =~ /^http/
+
+      _source
     end
 
   end

data/lib/locomotive/engine.rb

@@ -75,6 +75,12 @@ module Locomotive
       app.config.i18n.available_locales = Locomotive.config.locales
     end
 
+    initializer 'locomotive.notifications' do
+      ActiveSupport::Notifications.subscribe('steam.serve.url_redirection') do |name, start, finish, id, payload|
+        Locomotive::Site.inc_url_redirection_counter(payload[:site_id], payload[:url])
+      end
+    end
+
     initializer 'steam' do |app|
       require 'locomotive/steam_adaptor'
     end

data/lib/locomotive/middlewares/site.rb

@@ -117,7 +117,9 @@ module Locomotive
       end
 
       def default_host?(request)
-        (default_host && request.host == default_host) || localhost?(request)
+        request.env['locomotive.default_host'].present? ||
+        (default_host && request.host == default_host) ||
+        localhost?(request)
       end
 
       def localhost?(request)

data/lib/locomotive/mongoid/patches.rb

@@ -163,17 +163,6 @@ module Mongoid #:nodoc:
     end
   end
 
-  # without callback feature
-  # module Callbacks #:nodoc:
-  #   module ClassMethods #:nodoc:
-  #     def without_callback(*args, &block)
-  #       skip_callback(*args)
-  #       yield
-  #       set_callback(*args)
-  #     end
-  #   end
-  # end
-
   # make the validators work with localized field
   module Validatable #:nodoc:
 
@@ -189,31 +178,23 @@ module Mongoid #:nodoc:
 
     module LocalizedEachValidator
 
-      # Performs validation on the supplied record. By default this will call
-      # +validates_each+ to determine validity therefore subclasses should
-      # override +validates_each+ with validation logic.
-      def validate(record)
-        attributes.each do |attribute|
-          field = record.fields[attribute.to_s]
-
-          # make sure that we use the localized value and not the translations when we test the allow_nil and allow_blank options
-          value = field.try(:localized?) ? record.send(attribute.to_sym) : record.read_attribute_for_validation(attribute)
-
-          next if (value.nil? && options[:allow_nil]) || (value.blank? && options[:allow_blank])
-
-          # use the translations of the localized field for the next part
-          value = record.read_attribute_for_validation(attribute) if field.try(:localized?)
-
-          validate_each(record, attribute, value)
+      def validate_each(document, attribute, value)
+        # validate the value only in the current locale
+        if (field = document.fields[document.database_field_name(attribute)]).try(:localized?)
+          value = value.try(:slice, ::Mongoid::Fields::I18n.locale.to_s)
         end
+
+        super(document, attribute, value)
       end
 
     end
 
-    [FormatValidator, LengthValidator, PresenceValidator, UniquenessValidator, ExclusionValidator].each do |klass|
+    [FormatValidator, LengthValidator, UniquenessValidator, ExclusionValidator].each do |klass|
       klass.send(:include, LocalizedEachValidator)
     end
 
+    # PresenceValidator defines its own validate_each method
+    PresenceValidator.send(:prepend, LocalizedEachValidator)
   end
 
 end

data/lib/locomotive/steam/middlewares/wysihtml_css.rb

@@ -12,7 +12,7 @@ module Locomotive
           status, headers, response = @app.call(env)
 
           if content?(env['steam.page'], response)
-            url   = ::ActionController::Base.helpers.stylesheet_url('locomotive/wysihtml5_editor')
+            url   = ::ActionController::Base.helpers.stylesheet_path('locomotive/wysihtml5_editor')
             html  = %(<link rel="stylesheet" type="text/css" href="#{url}">)
             response.first.gsub!('</head>', %(#{html}</head>))
           end

data/lib/locomotive/version.rb

@@ -2,5 +2,5 @@
 # MAJOR.MINOR.PATCH format.
 # 1.0.0-alpha < 1.0.0-alpha.1 < 1.0.0-alpha.beta < 1.0.0-beta < 1.0.0-beta.2 < 1.0.0-beta.11 < 1.0.0-rc.1 < 1.0.0
 module Locomotive #:nodoc
-  VERSION = '3.2.1'
+  VERSION = '3.3.0.rc1'
 end

data/spec/models/locomotive/concerns/site/metafields_spec.rb

@@ -62,7 +62,7 @@ describe Locomotive::Concerns::Site::Metafields do
       context 'protected field names' do
 
         let(:schema) { [{ 'label' => 'Social', 'fields' => [{ 'name' => 'method_missing', 'type' => 'string' }] }] }
-        it { is_expected.to eq(["The property '#/0/fields/0/name' of type String matched the disallowed schema"]) }
+        it { is_expected.to eq(["The property '#/0/fields/0/name' of type string matched the disallowed schema"]) }
 
       end
 

data/spec/models/locomotive/concerns/site/url_redirections_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 describe Locomotive::Concerns::Site::UrlRedirections do
 
-  let(:redirections) { {} }
-  let(:site) { build(:site, url_redirections: redirections) }
+  let(:redirections) { [] }
+  let(:redirections_information) { {} }
+  let(:site) { build(:site, url_redirections: redirections, url_redirections_information: redirections_information) }
 
   describe '#url_redirections=' do
 
@@ -39,4 +40,63 @@ describe Locomotive::Concerns::Site::UrlRedirections do
 
   end
 
+  describe '.inc_url_redirection_counter' do
+
+    let(:redirections) { ['/foo', '/bar'] }
+    let(:url) { '/foo' }
+
+    subject { site.reload.url_redirections_information['1effb2475fcfba4f9e8b8a1dbc8f3caf'] }
+
+    before { site.save; Locomotive::Site.inc_url_redirection_counter(site._id, url) }
+
+    it { is_expected.to eq('counter' => 1) }
+
+  end
+
+  describe '#url_redirections_with_information' do
+
+    let(:redirections) { ['/about', '/about-us'] }
+    let(:redirections_information) { { '77102f70526b1c2db0eced54632dc618' => { 'hidden' => true, 'counter' => 42 } } }
+
+    subject { site.url_redirections_with_information }
+
+    it { is_expected.to eq([{ 'source' => '/about', 'target' => '/about-us', 'hidden' => true, 'counter' => 42 }]) }
+
+  end
+
+  describe '#add_or_update_url_redirection' do
+
+    before { site.add_or_update_url_redirection('about', '/about-us', 'hidden' => true) }
+
+    it 'adds an url direction' do
+      expect(site.url_redirections).to eq([['/about', '/about-us']])
+      expect(site.url_redirections_information).to eq('77102f70526b1c2db0eced54632dc618' => { 'hidden' => true })
+    end
+
+    context 'the redirection exists' do
+
+      let(:redirections) { ['/about', '/old/about-us'] }
+
+      it 'updates the url direction' do
+        expect(site.url_redirections).to eq([['/about', '/about-us']])
+        expect(site.url_redirections_information).to eq('77102f70526b1c2db0eced54632dc618' => { 'hidden' => true })
+      end
+
+    end
+
+  end
+
+  describe '#remove_url_redirection' do
+
+    let(:redirections) { ['/about', '/about-us'] }
+
+    before { site.remove_url_redirection('about') }
+
+    it 'removes the url direction' do
+      expect(site.url_redirections).to eq([])
+      expect(site.url_redirections_information).to eq({})
+    end
+
+  end
+
 end

data/spec/models/locomotive/content_entry_spec.rb

@@ -388,12 +388,12 @@ describe Locomotive::ContentEntry do
 
   end
 
-  # it_should_behave_like 'model scoped by a site' do
+  it_should_behave_like 'model scoped by a site' do
 
-  #   let(:model)         { build_content_entry }
-  #   let(:attribute)     { :content_version }
+    let(:model)         { build_content_entry }
+    let(:attribute)     { :content_version }
 
-  # end
+  end
 
   def localize_content_type(content_type)
     content_type.entries_custom_fields.first.localized = true

data/spec/models/locomotive/page_spec.rb

@@ -392,25 +392,40 @@ describe Locomotive::Page do
 
   describe 'redirect extension' do
 
-    before(:each) do
-      @page = build(:page, site: nil, redirect: true, redirect_url: 'http://www.google.com/')
-    end
+    let(:site) { nil }
+    let(:page) { build(:page, site: site, redirect: true, redirect_url: 'http://www.google.com/') }
 
     it 'is considered as a redirect page' do
-      expect(@page.redirect?).to eq(true)
+      expect(page.redirect?).to eq(true)
     end
 
     it 'validates the redirect_url if redirect is set' do
-      @page.redirect_url = nil
-      expect(@page).to_not be_valid
-      expect(@page.errors[:redirect_url]).to eq(["can't be blank"])
+      page.redirect_url = nil
+      expect(page).to_not be_valid
+      expect(page.errors[:redirect_url]).to eq(["can't be blank"])
     end
 
     it 'should validate format of redirect_url' do
-      @page.redirect_url = "invalid url with spaces"
-      expect(@page).to_not be_valid
-      expect(@page.errors[:redirect_url]).to eq(["is invalid"])
+      page.redirect_url = "invalid url with spaces"
+      expect(page).to_not be_valid
+      expect(page.errors[:redirect_url]).to eq(["is invalid"])
     end
+
+    context 'localized site' do
+
+      let(:site) { create(:site, locales: %w(en fr)) }
+
+      it 'validates the presence of redirect_url' do
+        ::Mongoid::Fields::I18n.locale = :en
+        page
+        ::Mongoid::Fields::I18n.locale = :fr
+        page.redirect_url = nil
+        ::Mongoid::Fields::I18n.locale = :en
+        expect(page).to be_valid
+      end
+
+    end
+
   end
 
   describe 'response type' do

data/spec/models/locomotive/site_spec.rb

@@ -147,6 +147,8 @@ describe Locomotive::Site do
       it 'does not allow to remove the default locale' do
         site.update_attributes locales: %w(fr)
         expect(site.errors[:locales]).to eq(['The previous default locale can not be removed right away.'])
+        site.update_attributes locales: [:en]
+        expect(site.errors[:locales]).to eq []
       end
 
     end

data/spec/requests/locomotive/steam/cache_spec.rb

@@ -39,7 +39,7 @@ describe Locomotive::Steam::Middlewares::Cache do
 
     subject { middleware.send(:cache_key, steam_env) }
 
-    it { expect(subject).to eq 'cb8743e499136fd491c386a25083aa6d' }
+    it { expect(subject).to eq '93a2150e6ee016394b95f1a6944c1f69' }
 
   end
 

data/spec/support/factories.rb

@@ -213,6 +213,7 @@ FactoryGirl.define do
         content_type.entries_custom_fields.build label: 'Duration', name: 'duration', type: 'integer'
         content_type.entries_custom_fields.build label: 'Tags', name: 'tags', type: 'tags'
         content_type.entries_custom_fields.build label: 'Price', name: 'price', type: 'money'
+        content_type.entries_custom_fields.build label: 'Metadata', name: 'metadata', type: 'json'
         content_type.entries_custom_fields.build label: 'Archived at', name: 'archived_at', type: 'date'
       end
     end

data/vendor/assets/javascripts/locomotive/datepicker_i18n.js.erb

@@ -6,6 +6,12 @@
   <% I18n.reload! %>
 <% end %>
 
+<% default_month_names      = [I18n.t('date.month_names', locale: :en)] %>
+<% default_abbr_month_names = [I18n.t('date.abbr_month_names', locale: :en)] %>
+<% default_day_names        = [I18n.t('date.day_names', locale: :en)] %>
+<% default_abbr_day_names   = [I18n.t('date.abbr_day_names', locale: :en)] %>
+<% default_date_format      = [I18n.t('date.formats.default', locale: :en)] %>
+
 jQuery(function($){
 <% Locomotive.config.locales.each do |locale| %>
   <% I18n.with_locale(locale) do %>
@@ -14,12 +20,12 @@ jQuery(function($){
       prevText:         '<%= I18n.t('date_picker.prev_text', :default => '&#x3c;Prev') %>',
       nextText:         '<%= I18n.t('date_picker.next_text', :default => 'Next&#x3e;') %>',
       currentText:      '<%= I18n.t('date_picker.current_text', :default => 'Current') %>',
-      monthNames:       [<%= I18n.t('date.month_names').dup.delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize}'" }.join(', ') %>],
-      monthNamesShort:  [<%= I18n.t('date.abbr_month_names').dup.delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize.gsub(/\.$/, '')}'" }.join(', ') %>],
-      dayNames:         [<%= I18n.t('date.day_names').dup.delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize.gsub("'", %q(\\\'))}'" }.join(', ') %>],
-      dayNamesShort:    [<%= I18n.t('date.abbr_day_names').dup.delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize}'" }.join(', ') %>],
-      dayNamesMin:      [<%= I18n.t('date.abbr_day_names').dup.delete_if { |d| d.blank? }.map { |d| "'#{d[0..1].capitalize}'" }.join(', ') %>],
-      dateFormat:       '<%= I18n.t('date.formats.default').gsub('%d', 'dd').gsub('%m', 'mm').gsub('%Y', 'yy') %>',
+      monthNames:       [<%= I18n.t('date.month_names', default: default_month_names).dup.delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize}'" }.join(', ') %>],
+      monthNamesShort:  [<%= I18n.t('date.abbr_month_names', default: default_abbr_month_names).dup.delete_if { |m| m.blank? }.map { |m| "'#{m.capitalize.gsub(/\.$/, '')}'" }.join(', ') %>],
+      dayNames:         [<%= I18n.t('date.day_names', default: default_day_names).dup.delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize.gsub("'", %q(\\\'))}'" }.join(', ') %>],
+      dayNamesShort:    [<%= I18n.t('date.abbr_day_names', default: default_abbr_day_names).dup.delete_if { |d| d.blank? }.map { |d| "'#{d.capitalize}'" }.join(', ') %>],
+      dayNamesMin:      [<%= I18n.t('date.abbr_day_names', default: default_abbr_day_names).dup.delete_if { |d| d.blank? }.map { |d| "'#{d[0..1].capitalize}'" }.join(', ') %>],
+      dateFormat:       '<%= I18n.t('date.formats.default', default: default_date_format).gsub('%d', 'dd').gsub('%m', 'mm').gsub('%Y', 'yy') %>',
       firstDay:         1,
       isRTL:            false
     };

data/vendor/assets/javascripts/locomotive/wysihtml5x-toolbar.js

@@ -16637,47 +16637,44 @@ wysihtml5.views.View = Base.extend(
           }
         });
       }
-
       dom.observe(this.element, "keydown", function(event) {
         var keyCode = event.keyCode;
 
-        if (event.shiftKey) {
+        if (event.ctrlKey || event.defaultPrevented) {
           return;
         }
 
         if (keyCode !== wysihtml5.ENTER_KEY && keyCode !== wysihtml5.BACKSPACE_KEY) {
           return;
         }
-        var blockElement = dom.getParentElement(that.selection.getSelectedNode(), { query: USE_NATIVE_LINE_BREAK_INSIDE_TAGS }, 4);
-        if (blockElement) {
-          setTimeout(function() {
-            // Unwrap paragraph after leaving a list or a H1-6
-            var selectedNode = that.selection.getSelectedNode(),
-                list;
+        if (keyCode === wysihtml5.ENTER_KEY && (that.config.useLineBreaks || event.shiftKey) && !wysihtml5.browser.insertsLineBreaksOnReturn()) {
+          event.preventDefault();
+          that.commands.exec("insertLineBreak");
+        } else {
+          var blockElement = dom.getParentElement(that.selection.getSelectedNode(), { query: USE_NATIVE_LINE_BREAK_INSIDE_TAGS }, 4);
+          if (blockElement) {
+            setTimeout(function() {
+              // Unwrap paragraph after leaving a list or a H1-6
+              var selectedNode = that.selection.getSelectedNode(),
+              list;
+
+              if (blockElement.nodeName === "LI") {
+                if (!selectedNode) {
+                  return;
+                }
 
-            if (blockElement.nodeName === "LI") {
-              if (!selectedNode) {
-                return;
-              }
+                list = dom.getParentElement(selectedNode, { query: LIST_TAGS }, 2);
 
-              list = dom.getParentElement(selectedNode, { query: LIST_TAGS }, 2);
+                if (!list) {
+                  adjust(selectedNode);
+                }
+              }
 
-              if (!list) {
+              if (keyCode === wysihtml5.ENTER_KEY && blockElement.nodeName.match(/^H[1-6]$/)) {
                 adjust(selectedNode);
               }
-            }
-
-            if (keyCode === wysihtml5.ENTER_KEY && blockElement.nodeName.match(/^H[1-6]$/)) {
-              adjust(selectedNode);
-            }
-          }, 0);
-          return;
-        }
-
-        if (that.config.useLineBreaks && keyCode === wysihtml5.ENTER_KEY && !wysihtml5.browser.insertsLineBreaksOnReturn()) {
-          event.preventDefault();
-          that.commands.exec("insertLineBreak");
-
+            }, 0);
+          }
         }
       });
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: locomotivecms
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0.rc1
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -16,56 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 12.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.5.0
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 4.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.6
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.2.8
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.5.10
 - !ruby/object:Gem::Dependency
   name: devise-encryptable
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.15.1
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +100,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.3
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: mongoid-tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: mongo_session_store-rails4
   requirement: !ruby/object:Gem::Requirement
@@ -156,70 +142,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: locomotivecms_steam
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 3.0.7
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.3
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-kaminari-views
   requirement: !ruby/object:Gem::Requirement
@@ -240,28 +226,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.9
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -338,28 +324,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.3.1
+        version: 6.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.3.3.1
+        version: 6.7.2
 - !ruby/object:Gem::Dependency
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
   name: nprogress-rails
   requirement: !ruby/object:Gem::Requirement
@@ -380,14 +366,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.7.8
 - !ruby/object:Gem::Dependency
   name: bazaar
   requirement: !ruby/object:Gem::Requirement
@@ -408,98 +394,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.1
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: carrierwave-mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rack-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-- !ruby/object:Gem::Dependency
-  name: mimetype-fu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: actionmailer-with-request
   requirement: !ruby/object:Gem::Requirement
@@ -620,6 +578,7 @@ files:
 - app/api/locomotive/api/resources/theme_asset_resource.rb
 - app/api/locomotive/api/resources/token_resource.rb
 - app/api/locomotive/api/resources/translation_resource.rb
+- app/api/locomotive/api/resources/url_redirection_resource.rb
 - app/api/locomotive/api/resources/version_resource.rb
 - app/assets/images/locomotive/blank.png
 - app/assets/images/locomotive/deadend.png
@@ -627,24 +586,29 @@ files:
 - app/assets/images/locomotive/icons/flags/bf.png
 - app/assets/images/locomotive/icons/flags/bg.png
 - app/assets/images/locomotive/icons/flags/cs.png
+- app/assets/images/locomotive/icons/flags/da.png
 - app/assets/images/locomotive/icons/flags/de.png
+- app/assets/images/locomotive/icons/flags/el.png
 - app/assets/images/locomotive/icons/flags/en.png
 - app/assets/images/locomotive/icons/flags/es.png
 - app/assets/images/locomotive/icons/flags/et.png
+- app/assets/images/locomotive/icons/flags/fa-IR.png
+- app/assets/images/locomotive/icons/flags/fi-FI.png
 - app/assets/images/locomotive/icons/flags/fr.png
 - app/assets/images/locomotive/icons/flags/it.png
-- app/assets/images/locomotive/icons/flags/ja.png
+- app/assets/images/locomotive/icons/flags/ja-JP.png
 - app/assets/images/locomotive/icons/flags/lt.png
 - app/assets/images/locomotive/icons/flags/mg.png
 - app/assets/images/locomotive/icons/flags/nb.png
 - app/assets/images/locomotive/icons/flags/nl.png
-- app/assets/images/locomotive/icons/flags/pl.png
+- app/assets/images/locomotive/icons/flags/pl-PL.png
 - app/assets/images/locomotive/icons/flags/pt-BR.png
 - app/assets/images/locomotive/icons/flags/pt.png
 - app/assets/images/locomotive/icons/flags/ru.png
 - app/assets/images/locomotive/icons/flags/sk.png
 - app/assets/images/locomotive/icons/flags/sr.png
 - app/assets/images/locomotive/icons/flags/sv.png
+- app/assets/images/locomotive/icons/flags/uk.png
 - app/assets/images/locomotive/icons/flags/zh-CN.png
 - app/assets/images/locomotive/logo-white.png
 - app/assets/images/locomotive/logo.png
@@ -1029,107 +993,156 @@ files:
 - config/initializers/simple_form.rb
 - config/initializers/slim.rb
 - config/initializers/time_format.rb
+- config/locales/ca.yml
+- config/locales/carrierwave.ar.yml
+- config/locales/carrierwave.ca.yml
 - config/locales/carrierwave.cs.yml
+- config/locales/carrierwave.da.yml
 - config/locales/carrierwave.de.yml
 - config/locales/carrierwave.el.yml
 - config/locales/carrierwave.en.yml
 - config/locales/carrierwave.es.yml
+- config/locales/carrierwave.fi-FI.yml
 - config/locales/carrierwave.fr.yml
+- config/locales/carrierwave.it.yml
+- config/locales/carrierwave.ja-JP.yml
 - config/locales/carrierwave.lt.yml
 - config/locales/carrierwave.nl.yml
+- config/locales/carrierwave.pl-PL.yml
 - config/locales/carrierwave.pt-BR.yml
 - config/locales/carrierwave.ru.yml
+- config/locales/carrierwave.sv-FI.yml
 - config/locales/carrierwave.sv.yml
 - config/locales/carrierwave.uk.yml
 - config/locales/carrierwave.zh-CN.yml
 - config/locales/cs.yml
 - config/locales/de.yml
+- config/locales/default.ca.yml
 - config/locales/default.cs.yml
+- config/locales/default.da.yml
 - config/locales/default.de.yml
 - config/locales/default.el.yml
 - config/locales/default.en.yml
 - config/locales/default.es.yml
+- config/locales/default.fa_IR.yml
+- config/locales/default.fi-FI.yml
 - config/locales/default.fr.yml
+- config/locales/default.ja-JP.yml
 - config/locales/default.lt.yml
 - config/locales/default.nl.yml
+- config/locales/default.pl-PL.yml
 - config/locales/default.pt-BR.yml
 - config/locales/default.ru.yml
+- config/locales/default.sv-FI.yml
 - config/locales/default.sv.yml
 - config/locales/default.uk.yml
 - config/locales/default.zh-CN.yml
+- config/locales/devise.ca.yml
 - config/locales/devise.cs.yml
+- config/locales/devise.da.yml
 - config/locales/devise.de.yml
 - config/locales/devise.el.yml
 - config/locales/devise.en.yml
 - config/locales/devise.es.yml
+- config/locales/devise.fi-FI.yml
 - config/locales/devise.fr.yml
+- config/locales/devise.it.yml
+- config/locales/devise.ja-JP.yml
 - config/locales/devise.lt.yml
 - config/locales/devise.nl.yml
+- config/locales/devise.pl-PL.yml
 - config/locales/devise.pt-BR.yml
 - config/locales/devise.ru.yml
+- config/locales/devise.sv-FI.yml
 - config/locales/devise.sv.yml
 - config/locales/devise.uk.yml
 - config/locales/devise.zh-CN.yml
 - config/locales/el.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/flash.ca.yml
 - config/locales/flash.cs.yml
+- config/locales/flash.da.yml
 - config/locales/flash.de.yml
 - config/locales/flash.el.yml
 - config/locales/flash.en.yml
 - config/locales/flash.es.yml
 - config/locales/flash.fr.yml
+- config/locales/flash.ja-JP.yml
 - config/locales/flash.lt.yml
 - config/locales/flash.nl.yml
+- config/locales/flash.pl-PL.yml
 - config/locales/flash.pt-BR.yml
 - config/locales/flash.ru.yml
+- config/locales/flash.sv-FI.yml
 - config/locales/flash.sv.yml
 - config/locales/flash.uk.yml
 - config/locales/flash.zh-CN.yml
 - config/locales/fr.yml
+- config/locales/inputs.ca.yml
 - config/locales/inputs.cs.yml
+- config/locales/inputs.da.yml
 - config/locales/inputs.de.yml
 - config/locales/inputs.el.yml
 - config/locales/inputs.en.yml
 - config/locales/inputs.es.yml
+- config/locales/inputs.fa_IR.yml
+- config/locales/inputs.fi-FI.yml
 - config/locales/inputs.fr.yml
+- config/locales/inputs.ja-JP.yml
 - config/locales/inputs.lt.yml
 - config/locales/inputs.nl.yml
+- config/locales/inputs.pl-PL.yml
 - config/locales/inputs.pt-BR.yml
 - config/locales/inputs.ru.yml
+- config/locales/inputs.sv-FI.yml
 - config/locales/inputs.sv.yml
 - config/locales/inputs.uk.yml
 - config/locales/inputs.zh-CN.yml
+- config/locales/ja-JP.yml
 - config/locales/lt.yml
+- config/locales/mongoid.ca.yml
 - config/locales/mongoid.cs.yml
+- config/locales/mongoid.da.yml
 - config/locales/mongoid.de.yml
 - config/locales/mongoid.el.yml
 - config/locales/mongoid.en.yml
 - config/locales/mongoid.es.yml
+- config/locales/mongoid.fa_IR.yml
 - config/locales/mongoid.fr.yml
+- config/locales/mongoid.ja-JP.yml
 - config/locales/mongoid.lt.yml
 - config/locales/mongoid.nl.yml
+- config/locales/mongoid.pl-PL.yml
 - config/locales/mongoid.pt-BR.yml
 - config/locales/mongoid.ru.yml
+- config/locales/mongoid.sv-FI.yml
 - config/locales/mongoid.sv.yml
 - config/locales/mongoid.uk.yml
 - config/locales/mongoid.zh-CN.yml
 - config/locales/nl.yml
+- config/locales/pl-PL.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
+- config/locales/simple_form.ca.yml
 - config/locales/simple_form.cs.yml
 - config/locales/simple_form.de.yml
 - config/locales/simple_form.el.yml
 - config/locales/simple_form.en.yml
 - config/locales/simple_form.es.yml
+- config/locales/simple_form.fi-FI.yml
 - config/locales/simple_form.fr.yml
+- config/locales/simple_form.ja-JP.yml
 - config/locales/simple_form.lt.yml
 - config/locales/simple_form.nl.yml
+- config/locales/simple_form.pl-PL.yml
 - config/locales/simple_form.pt-BR.yml
 - config/locales/simple_form.ru.yml
+- config/locales/simple_form.sv-FI.yml
 - config/locales/simple_form.sv.yml
 - config/locales/simple_form.uk.yml
 - config/locales/simple_form.zh-CN.yml
+- config/locales/sv-FI.yml
 - config/locales/sv.yml
 - config/locales/uk.yml
 - config/locales/zh-CN.yml
@@ -1366,9 +1379,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2