diff --git a/.travis.yml b/.travis.yml index 5415b15..44971bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ rvm: -- 2.1.0 +- 2.1 services: - couchdb before_script: diff --git a/Gemfile b/Gemfile index 2b7ab95..079cc4b 100644 --- a/Gemfile +++ b/Gemfile @@ -5,9 +5,9 @@ source "http://rubygems.org" # development dependencies will be added by default to the :development group. gemspec -gem "rails", ">= 4.1.0" +gem "rails", ">= 4.1.4" group :assets do - gem 'sass-rails' + gem 'sass-rails', '4.0.2' gem 'bourbon' gem 'coffee-script' #gem 'therubyracer', :platforms => :ruby @@ -23,7 +23,7 @@ gem 'devise_simply_stored', github: 'bterkuile/devise_simply_stored' gem 'tinymce-rails' gem 'haml-rails' gem 'slim-rails' -gem 'paperclip', '3.5.2' +gem 'paperclip' gem 'email_validator' # Declare any dependencies that are still in development here instead of in # your gemspec. These might include edge Rails or gems from your path or diff --git a/Gemfile.lock b/Gemfile.lock index 6d6cff0..8064ad7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,7 +22,7 @@ GIT GIT remote: git://github.com/bterkuile/simply_stored.git - revision: a4b672f68cbcf275aa10fc5014a3763238691956 + revision: 354fde89a88c1384ccc9d82989e3f05ac6977bd1 specs: simply_stored (1.0.0) activesupport @@ -88,10 +88,10 @@ GEM cocaine (0.5.4) climate_control (>= 0.0.3, < 1.0) coderay (1.1.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) couchrest (1.2.0) mime-types (~> 1.15) multi_json (~> 1.0) @@ -122,7 +122,7 @@ GEM haml (>= 3.1, < 5.0) railties (>= 4.0.1) hike (1.2.3) - i18n (0.6.9) + i18n (0.6.11) jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -135,11 +135,11 @@ GEM method_source (0.8.2) mime-types (1.25.1) mini_portile (0.6.0) - minitest (5.3.5) + minitest (5.4.0) multi_json (1.10.1) nokogiri (1.6.2.1) mini_portile (= 0.6.0) - paperclip (3.5.2) + paperclip (4.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) cocaine (~> 0.5.3) @@ -170,8 +170,11 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) - rest-client (1.6.7) - mime-types (>= 1.16) + rdoc (4.1.1) + json (~> 1.4) + rest-client (1.6.8) + mime-types (~> 1.16) + rdoc (>= 2.4.2) rspec-core (3.0.2) rspec-support (~> 3.0.0) rspec-expectations (3.0.2) @@ -192,11 +195,11 @@ GEM rspec-support (~> 3.0.0) rspec-support (3.0.2) sass (3.2.19) - sass-rails (4.0.3) + sass-rails (4.0.2) railties (>= 4.0.0, < 5.0) sass (~> 3.2.0) sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0) + sprockets-rails (~> 2.0.0) slim (2.0.3) temple (~> 0.6.6) tilt (>= 1.3.3, < 2.1) @@ -211,7 +214,7 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.3) + sprockets-rails (2.0.1) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (~> 2.8) @@ -255,11 +258,11 @@ DEPENDENCIES jquery-rails jquery-ui-rails orm_adapter! - paperclip (= 3.5.2) + paperclip pry-rails - rails (>= 4.1.0) + rails (>= 4.1.4) rspec-its - sass-rails + sass-rails (= 4.0.2) simply_stored! slim-rails steak