Jonne Haß
commit
e7be5d2f80
4 changed files with 126 additions and 119 deletions
53
Gemfile
53
Gemfile
|
|
@ -1,12 +1,10 @@
|
|||
source 'http://rubygems.org'
|
||||
|
||||
gem 'bundler', '> 1.1.0'
|
||||
|
||||
gem 'rails', '3.2.8'
|
||||
|
||||
gem 'foreman', '0.59'
|
||||
gem 'foreman', '0.60.2'
|
||||
|
||||
gem 'unicorn', '4.3.1', :require => false
|
||||
gem 'unicorn', '4.4.0', :require => false
|
||||
|
||||
gem 'rails_autolink', '1.0.9'
|
||||
|
||||
|
|
@ -25,7 +23,7 @@ gem 'omniauth-facebook', '1.4.1'
|
|||
gem 'omniauth-tumblr', '1.1'
|
||||
gem 'omniauth-twitter', '0.0.13'
|
||||
|
||||
gem 'twitter', '4.1.1'
|
||||
gem 'twitter', '4.2.0'
|
||||
|
||||
# mail
|
||||
|
||||
|
|
@ -33,10 +31,10 @@ gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
|
|||
gem 'messagebus_ruby_api', '1.0.3'
|
||||
|
||||
group :production do # we don't install these on travis to speed up test runs
|
||||
gem 'rails_admin', '0.1.1'
|
||||
gem 'rails_admin', '0.2.0'
|
||||
gem 'fastercsv', '1.5.5', :require => false
|
||||
gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
|
||||
gem 'rack-rewrite', '1.2.1', :require => false
|
||||
gem 'rack-rewrite', '1.3.1', :require => false
|
||||
|
||||
# analytics
|
||||
gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
|
||||
|
|
@ -55,7 +53,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
|
|||
|
||||
# file uploading
|
||||
|
||||
gem 'carrierwave', '0.6.2'
|
||||
gem 'carrierwave', '0.7.1'
|
||||
gem 'fog', '1.6.0'
|
||||
gem 'mini_magick', '3.4'
|
||||
|
||||
|
|
@ -67,18 +65,18 @@ gem 'acts_as_api', '0.4.1 '
|
|||
# localization
|
||||
|
||||
gem 'i18n-inflector-rails', '~> 1.0'
|
||||
gem 'rails-i18n', :git => "https://github.com/svenfuchs/rails-i18n.git"
|
||||
gem 'rails-i18n', '0.7.0'
|
||||
|
||||
# parsing
|
||||
|
||||
gem 'nokogiri', '1.5.5'
|
||||
gem 'redcarpet', "2.1.1"
|
||||
gem 'redcarpet', "2.2.2"
|
||||
gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
|
||||
gem 'ruby-oembed', '0.8.7'
|
||||
|
||||
# queue
|
||||
|
||||
gem 'resque', '1.22.0'
|
||||
gem 'resque', '1.23.0'
|
||||
gem 'resque-timeout', '1.0.0'
|
||||
|
||||
# tags
|
||||
|
|
@ -97,13 +95,13 @@ gem 'haml', '3.1.7'
|
|||
gem 'mobile-fu', '1.1.0'
|
||||
|
||||
gem 'will_paginate', '3.0.3'
|
||||
gem 'client_side_validations', '3.1.4'
|
||||
gem 'gon', '4.0.0'
|
||||
gem 'client_side_validations', '3.2.1'
|
||||
gem 'gon', '4.0.1'
|
||||
|
||||
# assets
|
||||
|
||||
group :assets do
|
||||
gem 'bootstrap-sass', '2.1.0.0'
|
||||
gem 'bootstrap-sass', '2.1.1.0'
|
||||
gem 'sass-rails', '3.2.5'
|
||||
|
||||
# Windows and OSX have an execjs compatible runtime built-in, Linux users should
|
||||
|
|
@ -113,7 +111,7 @@ group :assets do
|
|||
|
||||
# gem 'therubyracer', :platform => :ruby
|
||||
|
||||
gem 'handlebars_assets', '0.6.5'
|
||||
gem 'handlebars_assets', '0.6.6'
|
||||
gem 'uglifier', '1.3.0'
|
||||
|
||||
gem "asset_sync", '0.5.0', :require => false
|
||||
|
|
@ -124,7 +122,7 @@ gem 'jquery-rails', '2.1.3'
|
|||
# web
|
||||
|
||||
gem 'faraday', '0.8.4'
|
||||
gem 'faraday_middleware', '0.8.8'
|
||||
gem 'faraday_middleware', '0.9.0'
|
||||
|
||||
|
||||
gem 'jasmine', '1.2.1'
|
||||
|
|
@ -134,29 +132,30 @@ gem 'jasmine', '1.2.1'
|
|||
group :test do
|
||||
|
||||
|
||||
gem 'capybara', '1.1.2'
|
||||
gem 'capybara', '1.1.3'
|
||||
gem 'cucumber-rails', '1.3.0', :require => false
|
||||
gem 'database_cleaner', '0.8'
|
||||
gem 'database_cleaner', '0.9.1'
|
||||
|
||||
gem 'timecop', '0.5.1'
|
||||
gem 'timecop', '0.5.3'
|
||||
gem 'factory_girl_rails', '4.1.0'
|
||||
gem 'fixture_builder', '0.3.4'
|
||||
gem 'fuubar', '1.0.0'
|
||||
gem 'fuubar', '1.1.0'
|
||||
gem 'rspec-instafail', '0.2.4', :require => false
|
||||
gem 'selenium-webdriver', '2.25.0'
|
||||
gem 'selenium-webdriver', '2.26.0'
|
||||
|
||||
gem 'webmock', '1.8.10', :require => false
|
||||
gem 'webmock', '1.8.11', :require => false
|
||||
|
||||
gem 'spork', '1.0.0rc3'
|
||||
gem 'guard-rspec', '0.7.3'
|
||||
gem 'guard-spork', '0.8.0'
|
||||
gem 'guard-cucumber', '1.0.0'
|
||||
gem 'guard-rspec', '2.1.1'
|
||||
gem 'guard-spork', '1.2.3'
|
||||
gem 'guard-cucumber', '1.2.2'
|
||||
gem 'rb-inotify', '0.8.8'
|
||||
|
||||
end
|
||||
|
||||
group :test, :development do
|
||||
gem 'debugger', '1.2.0'
|
||||
gem "rspec-rails", "2.11.0"
|
||||
gem 'debugger', '1.2.1'
|
||||
gem "rspec-rails", "2.11.4"
|
||||
end
|
||||
|
||||
group :development do
|
||||
|
|
|
|||
188
Gemfile.lock
188
Gemfile.lock
|
|
@ -14,13 +14,6 @@ GIT
|
|||
markerb (1.0.0)
|
||||
redcarpet (>= 2.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/svenfuchs/rails-i18n.git
|
||||
revision: 855edc0e265a6d36fe5f62a886b2f0de455dd92a
|
||||
specs:
|
||||
rails-i18n (0.6.6)
|
||||
i18n (~> 0.5)
|
||||
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
|
|
@ -66,8 +59,8 @@ GEM
|
|||
activemodel
|
||||
fog
|
||||
bcrypt-ruby (3.0.1)
|
||||
bootstrap-sass (2.1.0.0)
|
||||
builder (3.0.3)
|
||||
bootstrap-sass (2.1.1.0)
|
||||
builder (3.0.4)
|
||||
capistrano (2.12.0)
|
||||
highline
|
||||
net-scp (>= 1.0.0)
|
||||
|
|
@ -77,26 +70,27 @@ GEM
|
|||
capistrano-ext (1.2.1)
|
||||
capistrano (>= 1.0.0)
|
||||
capistrano_colors (0.5.5)
|
||||
capybara (1.1.2)
|
||||
capybara (1.1.3)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
selenium-webdriver (~> 2.0)
|
||||
xpath (~> 0.1.4)
|
||||
carrierwave (0.6.2)
|
||||
carrierwave (0.7.1)
|
||||
activemodel (>= 3.2.0)
|
||||
activesupport (>= 3.2.0)
|
||||
childprocess (0.3.5)
|
||||
childprocess (0.3.6)
|
||||
ffi (~> 1.0, >= 1.0.6)
|
||||
client_side_validations (3.1.4)
|
||||
client_side_validations (3.2.1)
|
||||
coderay (1.0.8)
|
||||
coffee-rails (3.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.2.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.3.3)
|
||||
coffee-script-source (1.4.0)
|
||||
columnize (0.3.6)
|
||||
crack (0.3.1)
|
||||
cucumber (1.2.1)
|
||||
|
|
@ -108,14 +102,14 @@ GEM
|
|||
capybara (>= 1.1.2)
|
||||
cucumber (>= 1.1.8)
|
||||
nokogiri (>= 1.5.0)
|
||||
database_cleaner (0.8.0)
|
||||
debugger (1.2.0)
|
||||
database_cleaner (0.9.1)
|
||||
debugger (1.2.1)
|
||||
columnize (>= 0.3.1)
|
||||
debugger-linecache (~> 1.1.1)
|
||||
debugger-ruby_core_source (~> 1.1.3)
|
||||
debugger-ruby_core_source (~> 1.1.4)
|
||||
debugger-linecache (1.1.2)
|
||||
debugger-ruby_core_source (>= 1.1.1)
|
||||
debugger-ruby_core_source (1.1.3)
|
||||
debugger-ruby_core_source (1.1.4)
|
||||
devise (2.1.2)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
|
|
@ -123,7 +117,7 @@ GEM
|
|||
warden (~> 1.2.1)
|
||||
diff-lcs (1.1.3)
|
||||
erubis (2.7.0)
|
||||
excon (0.16.2)
|
||||
excon (0.16.7)
|
||||
execjs (1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
factory_girl (4.1.0)
|
||||
|
|
@ -133,7 +127,7 @@ GEM
|
|||
railties (>= 3.0.0)
|
||||
faraday (0.8.4)
|
||||
multipart-post (~> 1.1)
|
||||
faraday_middleware (0.8.8)
|
||||
faraday_middleware (0.9.0)
|
||||
faraday (>= 0.7.4, < 0.9)
|
||||
fastercsv (1.5.5)
|
||||
ffi (1.1.5)
|
||||
|
|
@ -150,33 +144,41 @@ GEM
|
|||
net-ssh (>= 2.1.3)
|
||||
nokogiri (~> 1.5.0)
|
||||
ruby-hmac
|
||||
font-awesome-sass-rails (2.0.0.0)
|
||||
railties (>= 3.1.1)
|
||||
sass-rails (>= 3.1.1)
|
||||
foreigner (1.2.1)
|
||||
activerecord (>= 3.0.0)
|
||||
foreman (0.59.0)
|
||||
foreman (0.60.2)
|
||||
thor (>= 0.13.6)
|
||||
formatador (0.2.3)
|
||||
fuubar (1.0.0)
|
||||
formatador (0.2.4)
|
||||
fuubar (1.1.0)
|
||||
rspec (~> 2.0)
|
||||
rspec-instafail (~> 0.2.0)
|
||||
ruby-progressbar (~> 0.0.10)
|
||||
gherkin (2.11.2)
|
||||
ruby-progressbar (~> 1.0.0)
|
||||
gherkin (2.11.5)
|
||||
json (>= 1.4.6)
|
||||
gon (4.0.0)
|
||||
gon (4.0.1)
|
||||
actionpack (>= 2.3.0)
|
||||
json
|
||||
guard (1.1.1)
|
||||
guard (1.5.4)
|
||||
listen (>= 0.4.2)
|
||||
lumberjack (>= 1.0.2)
|
||||
pry (>= 0.9.10)
|
||||
thor (>= 0.14.6)
|
||||
guard-cucumber (1.0.0)
|
||||
guard-cucumber (1.2.2)
|
||||
cucumber (>= 1.2.0)
|
||||
guard (>= 1.1.0)
|
||||
guard-rspec (0.7.3)
|
||||
guard (>= 0.10.0)
|
||||
guard-spork (0.8.0)
|
||||
guard (>= 0.10.0)
|
||||
guard-rspec (2.1.1)
|
||||
guard (>= 1.1)
|
||||
rspec (~> 2.11)
|
||||
guard-spork (1.2.3)
|
||||
childprocess (>= 0.2.3)
|
||||
guard (>= 1.1)
|
||||
spork (>= 0.8.4)
|
||||
sys-proctable
|
||||
haml (3.1.7)
|
||||
handlebars_assets (0.6.5)
|
||||
handlebars_assets (0.6.6)
|
||||
execjs (>= 1.2.9)
|
||||
sprockets (>= 2.0.3)
|
||||
tilt
|
||||
|
|
@ -202,7 +204,7 @@ GEM
|
|||
jquery-rails (2.1.3)
|
||||
railties (>= 3.1.0, < 5.0)
|
||||
thor (~> 0.14)
|
||||
jquery-ui-rails (2.0.1)
|
||||
jquery-ui-rails (2.0.2)
|
||||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
jruby-pageant (1.1.1)
|
||||
|
|
@ -214,22 +216,22 @@ GEM
|
|||
activesupport (>= 3.0.0)
|
||||
kgio (2.7.4)
|
||||
libwebsocket (0.1.5)
|
||||
listen (0.4.2)
|
||||
rb-fchange (~> 0.0.5)
|
||||
rb-fsevent (~> 0.9.1)
|
||||
rb-inotify (~> 0.8.8)
|
||||
addressable
|
||||
listen (0.5.3)
|
||||
lumberjack (1.0.2)
|
||||
mail (2.4.4)
|
||||
i18n (>= 0.4.0)
|
||||
mime-types (~> 1.16)
|
||||
treetop (~> 1.4.8)
|
||||
messagebus_ruby_api (1.0.3)
|
||||
method_source (0.8.1)
|
||||
mime-types (1.19)
|
||||
mini_magick (3.4)
|
||||
subexec (~> 0.2.1)
|
||||
mobile-fu (1.1.0)
|
||||
rack-mobile-detect
|
||||
rails
|
||||
multi_json (1.3.6)
|
||||
multi_json (1.3.7)
|
||||
multipart-post (1.1.5)
|
||||
mysql2 (0.3.11)
|
||||
nested_form (0.2.3)
|
||||
|
|
@ -267,6 +269,10 @@ GEM
|
|||
omniauth-oauth (~> 1.0)
|
||||
orm_adapter (0.4.0)
|
||||
polyglot (0.3.3)
|
||||
pry (0.9.10)
|
||||
coderay (~> 1.0.5)
|
||||
method_source (~> 0.8)
|
||||
slop (~> 3.3.1)
|
||||
rack (1.4.1)
|
||||
rack-cache (1.2)
|
||||
rack (>= 0.4)
|
||||
|
|
@ -281,10 +287,10 @@ GEM
|
|||
rack (~> 1.3)
|
||||
rack-protection (1.2.0)
|
||||
rack
|
||||
rack-rewrite (1.2.1)
|
||||
rack-rewrite (1.3.1)
|
||||
rack-ssl (1.3.2)
|
||||
rack
|
||||
rack-test (0.6.1)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.8)
|
||||
actionmailer (= 3.2.8)
|
||||
|
|
@ -294,16 +300,19 @@ GEM
|
|||
activesupport (= 3.2.8)
|
||||
bundler (~> 1.0)
|
||||
railties (= 3.2.8)
|
||||
rails_admin (0.1.1)
|
||||
bootstrap-sass (~> 2.0)
|
||||
rails-i18n (0.7.0)
|
||||
i18n (~> 0.5)
|
||||
rails_admin (0.2.0)
|
||||
bootstrap-sass (~> 2.1)
|
||||
builder (~> 3.0)
|
||||
coffee-rails (~> 3.1)
|
||||
font-awesome-sass-rails (~> 2.0)
|
||||
haml (~> 3.1)
|
||||
jquery-rails (~> 2.0)
|
||||
jquery-rails (~> 2.1)
|
||||
jquery-ui-rails (~> 2.0)
|
||||
kaminari (~> 0.12)
|
||||
kaminari (~> 0.14)
|
||||
nested_form (~> 0.2.3)
|
||||
rack-pjax (~> 0.5)
|
||||
rack-pjax (~> 0.6)
|
||||
rails (~> 3.1)
|
||||
remotipart (~> 1.0)
|
||||
sass-rails (~> 3.1)
|
||||
|
|
@ -316,21 +325,18 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
rdoc (~> 3.4)
|
||||
thor (>= 0.14.6, < 2.0)
|
||||
raindrops (0.9.0)
|
||||
raindrops (0.10.0)
|
||||
rake (0.9.2.2)
|
||||
rb-fchange (0.0.5)
|
||||
ffi
|
||||
rb-fsevent (0.9.1)
|
||||
rb-inotify (0.8.8)
|
||||
ffi (>= 0.5.0)
|
||||
rdoc (3.12)
|
||||
json (~> 1.4)
|
||||
redcarpet (2.1.1)
|
||||
redis (3.0.1)
|
||||
redcarpet (2.2.2)
|
||||
redis (3.0.2)
|
||||
redis-namespace (1.2.1)
|
||||
redis (~> 3.0.0)
|
||||
remotipart (1.0.2)
|
||||
resque (1.22.0)
|
||||
resque (1.23.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.0)
|
||||
sinatra (>= 0.9.2)
|
||||
|
|
@ -345,22 +351,22 @@ GEM
|
|||
rspec-expectations (2.11.3)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-instafail (0.2.4)
|
||||
rspec-mocks (2.11.2)
|
||||
rspec-rails (2.11.0)
|
||||
rspec-mocks (2.11.3)
|
||||
rspec-rails (2.11.4)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec (~> 2.11.0)
|
||||
ruby-hmac (0.4.0)
|
||||
ruby-oembed (0.8.7)
|
||||
ruby-progressbar (0.0.10)
|
||||
ruby-progressbar (1.0.2)
|
||||
rubyzip (0.9.9)
|
||||
sass (3.1.19)
|
||||
sass (3.2.3)
|
||||
sass-rails (3.2.5)
|
||||
railties (~> 3.2.0)
|
||||
sass (>= 3.1.10)
|
||||
tilt (~> 1.3)
|
||||
selenium-webdriver (2.25.0)
|
||||
selenium-webdriver (2.26.0)
|
||||
childprocess (>= 0.2.5)
|
||||
libwebsocket (~> 0.1.3)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -370,29 +376,31 @@ GEM
|
|||
rack (~> 1.3, >= 1.3.6)
|
||||
rack-protection (~> 1.2)
|
||||
tilt (~> 1.3, >= 1.3.3)
|
||||
slop (3.3.3)
|
||||
spork (1.0.0rc3)
|
||||
sprockets (2.1.3)
|
||||
hike (~> 1.2)
|
||||
rack (~> 1.0)
|
||||
tilt (~> 1.1, != 1.3.0)
|
||||
subexec (0.2.2)
|
||||
sys-proctable (0.9.2)
|
||||
thor (0.16.0)
|
||||
tilt (1.3.3)
|
||||
timecop (0.5.1)
|
||||
treetop (1.4.10)
|
||||
timecop (0.5.3)
|
||||
treetop (1.4.12)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
twitter (4.1.1)
|
||||
twitter (4.2.0)
|
||||
faraday (~> 0.8)
|
||||
multi_json (~> 1.3)
|
||||
simple_oauth (~> 0.1.6)
|
||||
typhoeus (0.3.3)
|
||||
mime-types
|
||||
tzinfo (0.3.33)
|
||||
tzinfo (0.3.35)
|
||||
uglifier (1.3.0)
|
||||
execjs (>= 0.3.0)
|
||||
multi_json (~> 1.0, >= 1.0.2)
|
||||
unicorn (4.3.1)
|
||||
unicorn (4.4.0)
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
raindrops (~> 0.7)
|
||||
|
|
@ -400,7 +408,7 @@ GEM
|
|||
rack (>= 1.0.0)
|
||||
warden (1.2.1)
|
||||
rack (>= 1.0)
|
||||
webmock (1.8.10)
|
||||
webmock (1.8.11)
|
||||
addressable (>= 2.2.7)
|
||||
crack (>= 0.1.7)
|
||||
will_paginate (3.0.3)
|
||||
|
|
@ -416,33 +424,32 @@ DEPENDENCIES
|
|||
acts_as_api (= 0.4.1)
|
||||
addressable (= 2.3.2)
|
||||
asset_sync (= 0.5.0)
|
||||
bootstrap-sass (= 2.1.0.0)
|
||||
bundler (> 1.1.0)
|
||||
bootstrap-sass (= 2.1.1.0)
|
||||
capistrano (= 2.12.0)
|
||||
capistrano-ext (= 1.2.1)
|
||||
capistrano_colors (= 0.5.5)
|
||||
capybara (= 1.1.2)
|
||||
carrierwave (= 0.6.2)
|
||||
client_side_validations (= 3.1.4)
|
||||
capybara (= 1.1.3)
|
||||
carrierwave (= 0.7.1)
|
||||
client_side_validations (= 3.2.1)
|
||||
cucumber-rails (= 1.3.0)
|
||||
database_cleaner (= 0.8)
|
||||
debugger (= 1.2.0)
|
||||
database_cleaner (= 0.9.1)
|
||||
debugger (= 1.2.1)
|
||||
devise (= 2.1.2)
|
||||
factory_girl_rails (= 4.1.0)
|
||||
faraday (= 0.8.4)
|
||||
faraday_middleware (= 0.8.8)
|
||||
faraday_middleware (= 0.9.0)
|
||||
fastercsv (= 1.5.5)
|
||||
fixture_builder (= 0.3.4)
|
||||
fog (= 1.6.0)
|
||||
foreigner (= 1.2.1)
|
||||
foreman (= 0.59)
|
||||
fuubar (= 1.0.0)
|
||||
gon (= 4.0.0)
|
||||
guard-cucumber (= 1.0.0)
|
||||
guard-rspec (= 0.7.3)
|
||||
guard-spork (= 0.8.0)
|
||||
foreman (= 0.60.2)
|
||||
fuubar (= 1.1.0)
|
||||
gon (= 4.0.1)
|
||||
guard-cucumber (= 1.2.2)
|
||||
guard-rspec (= 2.1.1)
|
||||
guard-spork (= 1.2.3)
|
||||
haml (= 3.1.7)
|
||||
handlebars_assets (= 0.6.5)
|
||||
handlebars_assets (= 0.6.6)
|
||||
http_accept_language (= 1.0.2)
|
||||
i18n-inflector-rails (~> 1.0)
|
||||
jasmine (= 1.2.1)
|
||||
|
|
@ -461,27 +468,28 @@ DEPENDENCIES
|
|||
rack-cors (= 0.2.7)
|
||||
rack-google-analytics (= 0.11.0)
|
||||
rack-piwik (= 0.1.3)
|
||||
rack-rewrite (= 1.2.1)
|
||||
rack-rewrite (= 1.3.1)
|
||||
rack-ssl (= 1.3.2)
|
||||
rails (= 3.2.8)
|
||||
rails-i18n!
|
||||
rails_admin (= 0.1.1)
|
||||
rails-i18n (= 0.7.0)
|
||||
rails_admin (= 0.2.0)
|
||||
rails_autolink (= 1.0.9)
|
||||
redcarpet (= 2.1.1)
|
||||
rb-inotify (= 0.8.8)
|
||||
redcarpet (= 2.2.2)
|
||||
remotipart (= 1.0.2)
|
||||
resque (= 1.22.0)
|
||||
resque (= 1.23.0)
|
||||
resque-timeout (= 1.0.0)
|
||||
roxml!
|
||||
rspec-instafail (= 0.2.4)
|
||||
rspec-rails (= 2.11.0)
|
||||
rspec-rails (= 2.11.4)
|
||||
ruby-oembed (= 0.8.7)
|
||||
sass-rails (= 3.2.5)
|
||||
selenium-webdriver (= 2.25.0)
|
||||
selenium-webdriver (= 2.26.0)
|
||||
spork (= 1.0.0rc3)
|
||||
timecop (= 0.5.1)
|
||||
twitter (= 4.1.1)
|
||||
timecop (= 0.5.3)
|
||||
twitter (= 4.2.0)
|
||||
typhoeus (= 0.3.3)
|
||||
uglifier (= 1.3.0)
|
||||
unicorn (= 4.3.1)
|
||||
webmock (= 1.8.10)
|
||||
unicorn (= 4.4.0)
|
||||
webmock (= 1.8.11)
|
||||
will_paginate (= 3.0.3)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# A sample Guardfile
|
||||
# More info at https://github.com/guard/guard#readme
|
||||
# also, http://asciicasts.com/episodes/264-guard
|
||||
guard 'rspec', :version => 2, :all_on_start => false do
|
||||
guard 'rspec', :all_on_start => false do
|
||||
watch(%r{^spec/.+_spec\.rb$})
|
||||
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" }
|
||||
watch('spec/spec_helper.rb') { "spec" }
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ describe Photo do
|
|||
file = File.open(@fail_fixture_name)
|
||||
lambda {
|
||||
@photo.unprocessed_image.store! file
|
||||
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: ["jpg", "jpeg", "png", "gif"]'
|
||||
}.should raise_error CarrierWave::IntegrityError, 'You are not allowed to upload "xml" files, allowed types: jpg, jpeg, png, gif'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue