From ea07b01ed1b53271b48c01772bc08398334f6198 Mon Sep 17 00:00:00 2001 From: Nicolae Claudius Date: Thu, 2 Jan 2014 13:05:48 +0200 Subject: [PATCH] deps update --- Gemfile | 14 +-- Gemfile.lock | 102 +++++++++++----------- app/controllers/users/hosts_controller.rb | 4 +- config/environments/development.rb | 2 + config/initializers/devise.rb | 4 + 5 files changed, 68 insertions(+), 58 deletions(-) diff --git a/Gemfile b/Gemfile index 7dfc4a2..4cdabcf 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'http://rubygems.org' -gem 'rails', '4.0.1' +gem 'rails', '4.0.2' gem 'mysql2', '~> 0.3.13' -gem 'devise', '~> 3.0.3' +gem 'devise', '~> 3.2.2' gem 'cancan', '= 1.6.7' gem 'squeel', '~> 1.1.0' gem 'sentient_model', '~> 1.0.4' @@ -23,7 +23,7 @@ gem 'seedbank', '~> 0.3.0' gem 'unicorn', '~> 4.6.3' gem 'sass-rails', '~> 4.0.0' gem 'compass-rails', '~> 1.1.0' -gem 'bootstrap-sass', '~> 3.0.2.1' +gem 'bootstrap-sass', '~> 3.0.3.0' gem 'webshims-rails', '~> 1.11.1' gem 'detect_timezone_rails', '~> 0.0.3' gem 'nprogress-rails', '~> 0.1.2.2' @@ -41,7 +41,7 @@ gem 'active_scaffold', '~> 3.4.0.rc', branch: 'fix-always-use-build_associated' # path: '/home/clyfe/dev/active_scaffold' # github: 'activescaffold/active_scaffold' -gem 'turbolinks', '~> 1.3.0' +gem 'turbolinks', '~> 2.1.0' gem 'faker','~> 1.2.0' gem 'factory_girl_rails', '~> 4.3.0' gem 'rails_admin', '~> 0.6.0' @@ -50,11 +50,11 @@ gem 'rails_admin', '~> 0.6.0' group :development do gem 'quiet_assets', '~> 1.0.1' - gem 'better_errors', '1.0.1' + gem 'better_errors', '1.1.0' gem 'binding_of_caller', '0.7.2' gem 'debase', '~> 0.0.7' gem 'bullet', '~> 4.7.1' - gem 'letter_opener', '~> 1.1.2' + gem 'letter_opener', '~> 1.2.0' # gem 'byebug', '~> 2.3.1' # gem 'ruby-debug-ide', '~> 0.4.18' # gem 'mongrel', '>= 1.2.0.pre2' @@ -74,7 +74,7 @@ group :test, :development do end group :test do - gem 'capybara', '~> 2.1.0' + gem 'capybara', '~> 2.2.0' gem 'database_rewinder', '~> 0.0.1' # gem 'rb-inotify', '~> 0.9.0' # gem 'libnotify', '~> 0.8.1' diff --git a/Gemfile.lock b/Gemfile.lock index 97b1f1b..7e4176b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,11 +29,11 @@ GIT GEM remote: http://rubygems.org/ specs: - actionmailer (4.0.1) - actionpack (= 4.0.1) + actionmailer (4.0.2) + actionpack (= 4.0.2) mail (~> 2.5.4) - actionpack (4.0.1) - activesupport (= 4.0.1) + actionpack (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) erubis (~> 2.7.0) rack (~> 1.5.2) @@ -41,16 +41,16 @@ GEM active-model-email-validator (1.0.2) activemodel mail - activemodel (4.0.1) - activesupport (= 4.0.1) + activemodel (4.0.2) + activesupport (= 4.0.2) builder (~> 3.1.0) - activerecord (4.0.1) - activemodel (= 4.0.1) + activerecord (4.0.2) + activemodel (= 4.0.2) activerecord-deprecated_finders (~> 1.0.2) - activesupport (= 4.0.1) + activesupport (= 4.0.2) arel (~> 4.0.0) activerecord-deprecated_finders (1.0.3) - activesupport (4.0.1) + activesupport (4.0.2) i18n (~> 0.6, >= 0.6.4) minitest (~> 4.2) multi_json (~> 1.3) @@ -59,24 +59,24 @@ GEM acts_as_nested_interval (0.1.0) rails (>= 3.2.1, < 5) addressable (2.3.5) - animate-rails (1.0.3) + animate-rails (1.0.4) rails arel (4.0.1) atomic (1.1.14) bcrypt-ruby (3.1.2) - better_errors (1.0.1) + better_errors (1.1.0) coderay (>= 1.0.0) erubis (>= 2.6.6) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap-sass (3.0.2.1) + bootstrap-sass (3.0.3.0) sass (~> 3.2) builder (3.1.4) bullet (4.7.1) activesupport uniform_notifier (>= 1.4.0) cancan (1.6.7) - capybara (2.1.0) + capybara (2.2.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -95,21 +95,22 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) - compass-rails (1.1.2) + compass-rails (1.1.3) compass (>= 0.12.2) concerned_with (0.1.0) dalli (2.6.4) database_rewinder (0.0.2) - debase (0.0.8) + debase (0.0.9) debugger-ruby_core_source debug_inspector (0.0.2) - debugger-ruby_core_source (1.2.3) + debugger-ruby_core_source (1.3.1) detect_timezone_rails (0.0.5) railties (>= 3.1) - devise (3.0.4) + devise (3.2.2) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.5) erubis (2.7.0) @@ -127,20 +128,20 @@ GEM haml (4.0.4) tilt hike (1.2.3) - i18n (0.6.5) + i18n (0.6.9) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (4.1.0) + jquery-ui-rails (4.1.1) railties (>= 3.1.0) json (1.8.1) kaminari (0.15.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.8.1) - launchy (2.4.0) + launchy (2.4.2) addressable (~> 2.3) - letter_opener (1.1.2) + letter_opener (1.2.0) launchy (~> 2.2) libv8 (3.16.14.3) mail (2.5.4) @@ -149,16 +150,16 @@ GEM mail_form (1.5.0) actionmailer (>= 3.2, < 5) activemodel (>= 3.2, < 5) - mime-types (1.25) + mime-types (1.25.1) mini_portile (0.5.2) minitest (4.7.5) multi_json (1.8.2) mysql2 (0.3.14) nested_form (0.3.2) - nilify_blanks (1.0.2) + nilify_blanks (1.0.3) activerecord (>= 3.0.0) activesupport (>= 3.0.0) - nokogiri (1.6.0) + nokogiri (1.6.1) mini_portile (~> 0.5.0) nprogress-rails (0.1.2.3) oily_png (1.1.0) @@ -175,13 +176,13 @@ GEM rack (~> 1.3) rack-test (0.6.2) rack (>= 1.0) - rails (4.0.1) - actionmailer (= 4.0.1) - actionpack (= 4.0.1) - activerecord (= 4.0.1) - activesupport (= 4.0.1) + rails (4.0.2) + actionmailer (= 4.0.2) + actionpack (= 4.0.2) + activerecord (= 4.0.2) + activesupport (= 4.0.2) bundler (>= 1.3.0, < 2.0) - railties (= 4.0.1) + railties (= 4.0.2) sprockets-rails (~> 2.0.0) rails-settings-cached (0.3.2) rails (>= 4.0.0) @@ -201,28 +202,29 @@ GEM sass-rails (~> 4.0) rails_config (0.3.3) activesupport (>= 3.0) - railties (4.0.1) - actionpack (= 4.0.1) - activesupport (= 4.0.1) + railties (4.0.2) + actionpack (= 4.0.2) + activesupport (= 4.0.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.12.0) - rake (10.1.0) + rake (10.1.1) ref (1.0.5) remotipart (1.2.1) rspec-core (2.14.7) rspec-expectations (2.14.4) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.4) - rspec-rails (2.14.0) + rspec-rails (2.14.1) actionpack (>= 3.0) + activemodel (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) rspec-core (~> 2.14.0) rspec-expectations (~> 2.14.0) rspec-mocks (~> 2.14.0) safe_yaml (0.9.7) - sass (3.2.12) + sass (3.2.13) sass-rails (4.0.1) railties (>= 4.0.0, < 5.0) sass (>= 3.1.10) @@ -230,10 +232,10 @@ GEM seedbank (0.3.0) sentient_model (1.0.4) bundler (>= 1.0) - simple_form (3.0.0) + simple_form (3.0.1) actionpack (>= 4.0.0, < 4.1) activemodel (>= 4.0.0, < 4.1) - sprockets (2.10.0) + sprockets (2.10.1) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -246,7 +248,7 @@ GEM activerecord (>= 3.0) activesupport (>= 3.0) polyamorous (~> 0.6.0) - switch_user (0.9.3) + switch_user (0.9.4) therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref @@ -257,10 +259,10 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - turbolinks (1.3.1) + turbolinks (2.1.0) coffee-rails tzinfo (0.3.38) - uglifier (2.3.1) + uglifier (2.3.3) execjs (>= 0.3.0) json (>= 1.8.0) unicorn (4.6.3) @@ -270,7 +272,7 @@ GEM uniform_notifier (1.4.0) warden (1.2.3) rack (>= 1.0) - webshims-rails (1.11.3.1) + webshims-rails (1.11.6.1) rails (> 3.1.0) xpath (2.0.0) nokogiri (~> 1.3) @@ -283,12 +285,12 @@ DEPENDENCIES active_scaffold (~> 3.4.0.rc)! acts_as_nested_interval (~> 0.1.0) animate-rails (~> 1.0.0) - better_errors (= 1.0.1) + better_errors (= 1.1.0) binding_of_caller (= 0.7.2) - bootstrap-sass (~> 3.0.2.1) + bootstrap-sass (~> 3.0.3.0) bullet (~> 4.7.1) cancan (= 1.6.7) - capybara (~> 2.1.0) + capybara (~> 2.2.0) coffee-rails (~> 4.0.0) compass-rails (~> 1.1.0) concerned_with (~> 0.1.0) @@ -296,13 +298,13 @@ DEPENDENCIES database_rewinder (~> 0.0.1) debase (~> 0.0.7) detect_timezone_rails (~> 0.0.3) - devise (~> 3.0.3) + devise (~> 3.2.2) factory_girl_rails (~> 4.3.0) faker (~> 1.2.0) jquery-rails (~> 3.0.4) jquery-ui-rails (~> 4.1.0) json (~> 1.8.0) - letter_opener (~> 1.1.2) + letter_opener (~> 1.2.0) mail_form (~> 1.5.0) mysql2 (~> 0.3.13) navigasmic (~> 0.5.6)! @@ -310,7 +312,7 @@ DEPENDENCIES nprogress-rails (~> 0.1.2.2) oily_png (~> 1.1.0) quiet_assets (~> 1.0.1) - rails (= 4.0.1) + rails (= 4.0.2) rails-settings-cached (~> 0.3.1) rails_admin (~> 0.6.0) rails_config (~> 0.3.3) @@ -322,7 +324,7 @@ DEPENDENCIES squeel (~> 1.1.0) switch_user (~> 0.9.3) therubyracer (~> 0.12.0) - turbolinks (~> 1.3.0) + turbolinks (~> 2.1.0) uglifier (~> 2.3.1) unicorn (~> 4.6.3) userstamp (~> 2.0.2)! diff --git a/app/controllers/users/hosts_controller.rb b/app/controllers/users/hosts_controller.rb index 274c407..1bb8b34 100644 --- a/app/controllers/users/hosts_controller.rb +++ b/app/controllers/users/hosts_controller.rb @@ -41,7 +41,9 @@ class Users::HostsController < UsersController end def beginning_of_chain - super.includes(:domain).where(:domains => {:name => Settings.host_domains}).readonly(false) + super.includes(:domain). + where(:domains => {:name => Settings.host_domains}). + readonly(false) end def before_create_save(record) diff --git a/config/environments/development.rb b/config/environments/development.rb index dc2c925..9b33d58 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -44,5 +44,7 @@ Entrydns::Application.configure do Bullet.rails_logger = true #Bullet.airbrake = true Bullet.add_footer = true + + Bullet.add_whitelist type: :n_plus_one_query, class_name: "Domain", association: :permissions end end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 46c1ea1..f306778 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -184,6 +184,10 @@ Devise.setup do |config| # The default HTTP method used to sign out a resource. Default is :delete. # config.sign_out_via = :delete config.sign_out_via = :get + + # http://blog.plataformatec.com.br/2013/08/devise-3-1-now-with-more-secure-defaults/ + config.allow_insecure_sign_in_after_confirmation = true + config.secret_key = '0db2fbf12dd3a0c5f1512b4ab4301bb5362772f664981abe167faa185203eaa491e037e9f0e66153184e498560b0509f234fa201f667f010014ae77f5fb4a7cf' # ==> OmniAuth # Add a new OmniAuth provider. Check the wiki for more information on setting