Update all bundled gems to lastest versions
This commit is contained in:
parent
10a8e1f094
commit
b25d4d256f
151
Gemfile.lock
151
Gemfile.lock
@ -1,35 +1,34 @@
|
|||||||
GEM
|
GEM
|
||||||
remote: http://rubygems.org/
|
remote: http://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actionmailer (3.1.3)
|
actionmailer (3.2.2)
|
||||||
actionpack (= 3.1.3)
|
actionpack (= 3.2.2)
|
||||||
mail (~> 2.3.0)
|
mail (~> 2.4.0)
|
||||||
actionpack (3.1.3)
|
actionpack (3.2.2)
|
||||||
activemodel (= 3.1.3)
|
activemodel (= 3.2.2)
|
||||||
activesupport (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
i18n (~> 0.6)
|
journey (~> 1.0.1)
|
||||||
rack (~> 1.3.5)
|
rack (~> 1.4.0)
|
||||||
rack-cache (~> 1.1)
|
rack-cache (~> 1.1)
|
||||||
rack-mount (~> 0.8.2)
|
|
||||||
rack-test (~> 0.6.1)
|
rack-test (~> 0.6.1)
|
||||||
sprockets (~> 2.0.3)
|
sprockets (~> 2.1.2)
|
||||||
activemodel (3.1.3)
|
activemodel (3.2.2)
|
||||||
activesupport (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
builder (~> 3.0.0)
|
builder (~> 3.0.0)
|
||||||
i18n (~> 0.6)
|
activerecord (3.2.2)
|
||||||
activerecord (3.1.3)
|
activemodel (= 3.2.2)
|
||||||
activemodel (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
activesupport (= 3.1.3)
|
arel (~> 3.0.2)
|
||||||
arel (~> 2.2.1)
|
|
||||||
tzinfo (~> 0.3.29)
|
tzinfo (~> 0.3.29)
|
||||||
activeresource (3.1.3)
|
activeresource (3.2.2)
|
||||||
activemodel (= 3.1.3)
|
activemodel (= 3.2.2)
|
||||||
activesupport (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
activesupport (3.1.3)
|
activesupport (3.2.2)
|
||||||
|
i18n (~> 0.6)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
arel (2.2.1)
|
arel (3.0.2)
|
||||||
bcrypt-ruby (3.0.1)
|
bcrypt-ruby (3.0.1)
|
||||||
builder (3.0.0)
|
builder (3.0.0)
|
||||||
capybara (1.1.2)
|
capybara (1.1.2)
|
||||||
@ -39,60 +38,60 @@ GEM
|
|||||||
rack-test (>= 0.5.4)
|
rack-test (>= 0.5.4)
|
||||||
selenium-webdriver (~> 2.0)
|
selenium-webdriver (~> 2.0)
|
||||||
xpath (~> 0.1.4)
|
xpath (~> 0.1.4)
|
||||||
childprocess (0.2.3)
|
childprocess (0.3.1)
|
||||||
ffi (~> 1.0.6)
|
ffi (~> 1.0.6)
|
||||||
diff-lcs (1.1.3)
|
diff-lcs (1.1.3)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
factory_girl (2.3.2)
|
factory_girl (2.6.4)
|
||||||
activesupport
|
activesupport (>= 2.3.9)
|
||||||
factory_girl_rails (1.4.0)
|
factory_girl_rails (1.7.0)
|
||||||
factory_girl (~> 2.3.0)
|
factory_girl (~> 2.6.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
ffi (1.0.11)
|
ffi (1.0.11)
|
||||||
guard (0.8.8)
|
guard (0.10.0)
|
||||||
|
ffi (>= 0.5.0)
|
||||||
thor (~> 0.14.6)
|
thor (~> 0.14.6)
|
||||||
guard-rspec (0.5.9)
|
guard-rspec (0.6.0)
|
||||||
guard (>= 0.8.4)
|
guard (>= 0.10.0)
|
||||||
guard-spork (0.4.0)
|
guard-spork (0.5.2)
|
||||||
guard (>= 0.8.4)
|
guard (>= 0.10.0)
|
||||||
spork (>= 0.8.4)
|
spork (>= 0.8.4)
|
||||||
haml (3.1.4)
|
haml (3.1.4)
|
||||||
hike (1.2.1)
|
hike (1.2.1)
|
||||||
i18n (0.6.0)
|
i18n (0.6.0)
|
||||||
json (1.6.3)
|
journey (1.0.3)
|
||||||
libnotify (0.6.0)
|
json (1.6.5)
|
||||||
mail (2.3.0)
|
libnotify (0.7.2)
|
||||||
|
mail (2.4.4)
|
||||||
i18n (>= 0.4.0)
|
i18n (>= 0.4.0)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mime-types (1.17.2)
|
mime-types (1.17.2)
|
||||||
multi_json (1.0.4)
|
multi_json (1.1.0)
|
||||||
nokogiri (1.5.0)
|
nokogiri (1.5.2)
|
||||||
pg (0.11.0)
|
pg (0.13.2)
|
||||||
polyglot (0.3.3)
|
polyglot (0.3.3)
|
||||||
rabl (0.6.0)
|
rabl (0.6.1)
|
||||||
activesupport (>= 2.3.14)
|
activesupport (>= 2.3.14)
|
||||||
multi_json (~> 1.0.3)
|
multi_json (~> 1.1.0)
|
||||||
rack (1.3.5)
|
rack (1.4.1)
|
||||||
rack-cache (1.1)
|
rack-cache (1.2)
|
||||||
rack (>= 0.4)
|
rack (>= 0.4)
|
||||||
rack-mount (0.8.3)
|
|
||||||
rack (>= 1.0.0)
|
|
||||||
rack-ssl (1.3.2)
|
rack-ssl (1.3.2)
|
||||||
rack
|
rack
|
||||||
rack-test (0.6.1)
|
rack-test (0.6.1)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (3.1.3)
|
rails (3.2.2)
|
||||||
actionmailer (= 3.1.3)
|
actionmailer (= 3.2.2)
|
||||||
actionpack (= 3.1.3)
|
actionpack (= 3.2.2)
|
||||||
activerecord (= 3.1.3)
|
activerecord (= 3.2.2)
|
||||||
activeresource (= 3.1.3)
|
activeresource (= 3.2.2)
|
||||||
activesupport (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
bundler (~> 1.0)
|
bundler (~> 1.0)
|
||||||
railties (= 3.1.3)
|
railties (= 3.2.2)
|
||||||
railties (3.1.3)
|
railties (3.2.2)
|
||||||
actionpack (= 3.1.3)
|
actionpack (= 3.2.2)
|
||||||
activesupport (= 3.1.3)
|
activesupport (= 3.2.2)
|
||||||
rack-ssl (~> 1.3.2)
|
rack-ssl (~> 1.3.2)
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
rdoc (~> 3.4)
|
||||||
@ -100,30 +99,30 @@ GEM
|
|||||||
rake (0.9.2.2)
|
rake (0.9.2.2)
|
||||||
rb-inotify (0.8.8)
|
rb-inotify (0.8.8)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rdoc (3.11)
|
rdoc (3.12)
|
||||||
json (~> 1.4)
|
json (~> 1.4)
|
||||||
rspec (2.7.0)
|
rspec (2.9.0)
|
||||||
rspec-core (~> 2.7.0)
|
rspec-core (~> 2.9.0)
|
||||||
rspec-expectations (~> 2.7.0)
|
rspec-expectations (~> 2.9.0)
|
||||||
rspec-mocks (~> 2.7.0)
|
rspec-mocks (~> 2.9.0)
|
||||||
rspec-core (2.7.1)
|
rspec-core (2.9.0)
|
||||||
rspec-expectations (2.7.0)
|
rspec-expectations (2.9.0)
|
||||||
diff-lcs (~> 1.1.2)
|
diff-lcs (~> 1.1.3)
|
||||||
rspec-mocks (2.7.0)
|
rspec-mocks (2.9.0)
|
||||||
rspec-rails (2.7.0)
|
rspec-rails (2.9.0)
|
||||||
actionpack (~> 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (~> 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (~> 3.0)
|
railties (>= 3.0)
|
||||||
rspec (~> 2.7.0)
|
rspec (~> 2.9.0)
|
||||||
rubyzip (0.9.5)
|
rubyzip (0.9.6.1)
|
||||||
selenium-webdriver (2.14.0)
|
selenium-webdriver (2.20.0)
|
||||||
childprocess (>= 0.2.1)
|
childprocess (>= 0.2.5)
|
||||||
ffi (~> 1.0.9)
|
ffi (~> 1.0)
|
||||||
multi_json (~> 1.0.4)
|
multi_json (~> 1.0)
|
||||||
rubyzip
|
rubyzip
|
||||||
shoulda-matchers (1.0.0)
|
shoulda-matchers (1.0.0)
|
||||||
spork (0.9.0.rc9)
|
spork (0.9.0)
|
||||||
sprockets (2.0.3)
|
sprockets (2.1.2)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
@ -132,7 +131,7 @@ GEM
|
|||||||
treetop (1.4.10)
|
treetop (1.4.10)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
tzinfo (0.3.31)
|
tzinfo (0.3.32)
|
||||||
xpath (0.1.4)
|
xpath (0.1.4)
|
||||||
nokogiri (~> 1.3)
|
nokogiri (~> 1.3)
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ require 'rails/all'
|
|||||||
|
|
||||||
if defined?(Bundler)
|
if defined?(Bundler)
|
||||||
# If you precompile assets before deploying to production, use this line
|
# If you precompile assets before deploying to production, use this line
|
||||||
Bundler.require *Rails.groups(:assets => %w(development test))
|
Bundler.require(*Rails.groups(:assets => %w(development test)))
|
||||||
# If you want your assets lazily compiled in production, use this line
|
# If you want your assets lazily compiled in production, use this line
|
||||||
# Bundler.require(:default, :assets, Rails.env)
|
# Bundler.require(:default, :assets, Rails.env)
|
||||||
end
|
end
|
||||||
@ -42,6 +42,17 @@ module Scube
|
|||||||
# BestStandardsSupport is setting this fucking X-UA-Compatible header...
|
# BestStandardsSupport is setting this fucking X-UA-Compatible header...
|
||||||
config.middleware.delete ActionDispatch::BestStandardsSupport
|
config.middleware.delete ActionDispatch::BestStandardsSupport
|
||||||
|
|
||||||
|
# Use SQL instead of Active Record's schema dumper when creating the database.
|
||||||
|
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
||||||
|
# like if you have constraints or database-specific column types
|
||||||
|
# config.active_record.schema_format = :sql
|
||||||
|
|
||||||
|
# Enforce whitelist mode for mass assignment.
|
||||||
|
# This will create an empty whitelist of attributes available for mass-assignment for all models
|
||||||
|
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible
|
||||||
|
# parameters by using an attr_accessible or attr_protected declaration.
|
||||||
|
# config.active_record.whitelist_attributes = true
|
||||||
|
|
||||||
# Enable the asset pipeline
|
# Enable the asset pipeline
|
||||||
config.assets.enabled = true
|
config.assets.enabled = true
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@ Scube::Application.configure do
|
|||||||
# Settings specified here will take precedence over those in config/application.rb
|
# Settings specified here will take precedence over those in config/application.rb
|
||||||
|
|
||||||
# In the development environment your application's code is reloaded on
|
# In the development environment your application's code is reloaded on
|
||||||
# every request. This slows down response time but is perfect for development
|
# every request. This slows down response time but is perfect for development
|
||||||
# since you don't have to restart the web server when you make code changes.
|
# since you don't have to restart the web server when you make code changes.
|
||||||
config.cache_classes = false
|
config.cache_classes = false
|
||||||
|
|
||||||
@ -22,6 +22,13 @@ Scube::Application.configure do
|
|||||||
# Only use best-standards-support built into browsers
|
# Only use best-standards-support built into browsers
|
||||||
config.action_dispatch.best_standards_support = :builtin
|
config.action_dispatch.best_standards_support = :builtin
|
||||||
|
|
||||||
|
# Raise exception on mass assignment protection for Active Record models
|
||||||
|
config.active_record.mass_assignment_sanitizer = :strict
|
||||||
|
|
||||||
|
# Log the query plan for queries taking more than this (works
|
||||||
|
# with SQLite, MySQL, and PostgreSQL)
|
||||||
|
config.active_record.auto_explain_threshold_in_seconds = 0.5
|
||||||
|
|
||||||
# Do not compress assets
|
# Do not compress assets
|
||||||
config.assets.compress = false
|
config.assets.compress = false
|
||||||
|
|
||||||
|
@ -33,8 +33,11 @@ Scube::Application.configure do
|
|||||||
# See everything in the log (default is :info)
|
# See everything in the log (default is :info)
|
||||||
# config.log_level = :debug
|
# config.log_level = :debug
|
||||||
|
|
||||||
|
# Prepend all log lines with the following tags
|
||||||
|
# config.log_tags = [ :subdomain, :uuid ]
|
||||||
|
|
||||||
# Use a different logger for distributed setups
|
# Use a different logger for distributed setups
|
||||||
# config.logger = SyslogLogger.new
|
# config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
|
||||||
|
|
||||||
# Use a different cache store in production
|
# Use a different cache store in production
|
||||||
# config.cache_store = :mem_cache_store
|
# config.cache_store = :mem_cache_store
|
||||||
@ -57,4 +60,8 @@ Scube::Application.configure do
|
|||||||
|
|
||||||
# Send deprecation notices to registered listeners
|
# Send deprecation notices to registered listeners
|
||||||
config.active_support.deprecation = :notify
|
config.active_support.deprecation = :notify
|
||||||
|
|
||||||
|
# Log the query plan for queries taking more than this (works
|
||||||
|
# with SQLite, MySQL, and PostgreSQL)
|
||||||
|
# config.active_record.auto_explain_threshold_in_seconds = 0.5
|
||||||
end
|
end
|
||||||
|
@ -2,9 +2,9 @@ Scube::Application.configure do
|
|||||||
# Settings specified here will take precedence over those in config/application.rb
|
# Settings specified here will take precedence over those in config/application.rb
|
||||||
|
|
||||||
# The test environment is used exclusively to run your application's
|
# The test environment is used exclusively to run your application's
|
||||||
# test suite. You never need to work with it otherwise. Remember that
|
# test suite. You never need to work with it otherwise. Remember that
|
||||||
# your test database is "scratch space" for the test suite and is wiped
|
# your test database is "scratch space" for the test suite and is wiped
|
||||||
# and recreated between test runs. Don't rely on the data there!
|
# and recreated between test runs. Don't rely on the data there!
|
||||||
config.cache_classes = true
|
config.cache_classes = true
|
||||||
|
|
||||||
# Configure static asset server for tests with Cache-Control for performance
|
# Configure static asset server for tests with Cache-Control for performance
|
||||||
@ -29,10 +29,8 @@ Scube::Application.configure do
|
|||||||
# ActionMailer::Base.deliveries array.
|
# ActionMailer::Base.deliveries array.
|
||||||
config.action_mailer.delivery_method = :test
|
config.action_mailer.delivery_method = :test
|
||||||
|
|
||||||
# Use SQL instead of Active Record's schema dumper when creating the test database.
|
# Raise exception on mass assignment protection for Active Record models
|
||||||
# This is necessary if your schema can't be completely dumped by the schema dumper,
|
config.active_record.mass_assignment_sanitizer = :strict
|
||||||
# like if you have constraints or database-specific column types
|
|
||||||
# config.active_record.schema_format = :sql
|
|
||||||
|
|
||||||
# Print deprecation notices to the stderr
|
# Print deprecation notices to the stderr
|
||||||
config.active_support.deprecation = :stderr
|
config.active_support.deprecation = :stderr
|
||||||
|
@ -8,3 +8,8 @@
|
|||||||
# inflect.irregular 'person', 'people'
|
# inflect.irregular 'person', 'people'
|
||||||
# inflect.uncountable %w( fish sheep )
|
# inflect.uncountable %w( fish sheep )
|
||||||
# end
|
# end
|
||||||
|
#
|
||||||
|
# These inflection rules are supported but not enabled by default:
|
||||||
|
# ActiveSupport::Inflector.inflections do |inflect|
|
||||||
|
# inflect.acronym 'RESTful'
|
||||||
|
# end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'home/index.html.haml' do
|
describe 'home/index' do
|
||||||
before do
|
before do
|
||||||
assign :playlists, [
|
assign :playlists, [
|
||||||
mock_model(Playlist, :name => 'Electro')
|
mock_model(Playlist, :name => 'Electro')
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'playlists/edit.html.haml' do
|
describe 'playlists/edit' do
|
||||||
let(:playlist) do
|
let(:playlist) do
|
||||||
mock_model(Playlist).as_new_record.as_null_object
|
mock_model(Playlist).as_new_record.as_null_object
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'playlists/index.html.haml' do
|
describe 'playlists/index' do
|
||||||
before do
|
before do
|
||||||
assign :playlists, [
|
assign :playlists, [
|
||||||
mock_model(Playlist, :name => 'Electro')
|
mock_model(Playlist, :name => 'Electro')
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'playlists/new.html.haml' do
|
describe 'playlists/new' do
|
||||||
let(:playlist) do
|
let(:playlist) do
|
||||||
mock_model(Playlist).as_new_record.as_null_object
|
mock_model(Playlist).as_new_record.as_null_object
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'sessions/new.html.haml' do
|
describe 'sessions/new' do
|
||||||
it 'renders a form to sign in' do
|
it 'renders a form to sign in' do
|
||||||
render
|
render
|
||||||
rendered.should have_selector(
|
rendered.should have_selector(
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'tracks/new.html.haml' do
|
describe 'tracks/new' do
|
||||||
let(:track) do
|
let(:track) do
|
||||||
mock_model(Track).as_new_record.as_null_object
|
mock_model(Track).as_new_record.as_null_object
|
||||||
end
|
end
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'tracks/show.html.haml' do
|
describe 'tracks/show' do
|
||||||
let(:track) { Factory.create(:track) }
|
let(:track) { Factory.create(:track) }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe 'users/new.html.haml' do
|
describe 'users/new' do
|
||||||
let(:user) do
|
let(:user) do
|
||||||
mock_model(User).as_new_record.as_null_object
|
mock_model(User).as_new_record.as_null_object
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user