Switch to official couch_potato version

This commit is contained in:
2015-07-17 12:44:52 +02:00
parent a8590c7b49
commit af6edfd0aa
9 changed files with 106 additions and 70 deletions
+37 -27
View File
@@ -10,15 +10,6 @@ GIT
slim-rails
tinymce-rails
GIT
remote: git://github.com/bterkuile/couch_potato.git
revision: 8929326ee855e964a441a8ede941b52c0ee88a16
specs:
couch_potato (0.7.1)
activemodel
couchrest (>= 1.0.1)
json (~> 1.6)
GIT
remote: git://github.com/bterkuile/devise_simply_stored.git
revision: 86f93782c607958e7f99a6fdbae5566e17047273
@@ -28,7 +19,7 @@ GIT
GIT
remote: git://github.com/bterkuile/simply_stored.git
revision: 652caf8c2cfe4f828477f8b76d0cd201851cd53d
revision: 4f3d144096a7deb457a9e6b92c3ced0f4a9eeff0
specs:
simply_stored (1.0.0)
activesupport
@@ -134,11 +125,10 @@ GEM
capybara (>= 1.0, < 3)
colored
launchy
capybara-webkit (1.6.0)
capybara (>= 2.3.0, < 2.5.0)
json
celluloid (0.16.0)
timers (~> 4.0.0)
childprocess (0.5.6)
ffi (~> 1.0, >= 1.0.11)
climate_control (0.0.3)
activesupport (>= 3.0)
cocaine (0.5.7)
@@ -154,10 +144,14 @@ GEM
colored (1.2)
colorize (0.7.7)
cookiejar (0.3.2)
couchrest (1.2.0)
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
couch_potato (1.4.0)
activemodel
couchrest (~> 1.2.0)
json (~> 1.6)
couchrest (1.2.1)
mime-types (>= 1.15)
multi_json (~> 1.7, ~> 1.0)
rest-client (~> 1.8.0)
crack (0.4.2)
safe_yaml (~> 1.0.0)
debug_inspector (0.0.2)
@@ -171,6 +165,8 @@ GEM
devise-i18n (0.11.4)
diff-lcs (1.2.5)
docile (1.1.5)
domain_name (0.5.24)
unf (>= 0.0.5, < 1.0.0)
dotenv (1.0.2)
em-http-request (1.1.2)
addressable (>= 2.3.4)
@@ -227,6 +223,7 @@ GEM
faye-websocket (0.9.2)
eventmachine (>= 0.12.0)
websocket-driver (>= 0.5.1)
ffi (1.9.10)
font-awesome-rails (4.3.0.0)
railties (>= 3.2, < 5.0)
foreman (0.77.0)
@@ -246,6 +243,8 @@ GEM
hashie (3.4.0)
hike (1.2.3)
hitimes (1.2.2)
http-cookie (1.0.2)
domain_name (~> 0.5)
http_parser.rb (0.6.0)
i18n (0.7.0)
iso_country_codes (0.6.1)
@@ -258,7 +257,7 @@ GEM
js-routes (1.0.0)
railties (>= 3.2)
sprockets-rails
json (1.8.2)
json (1.8.3)
jwt (1.3.0)
kaminari (0.16.3)
actionpack (>= 3.0.0)
@@ -272,17 +271,18 @@ GEM
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (1.25.1)
mime-types (2.6.1)
mini_magick (4.1.0)
mini_portile (0.6.2)
minitest (5.5.1)
multi_json (1.11.0)
minitest (5.7.0)
multi_json (1.11.2)
multi_xml (0.5.5)
multipart-post (2.0.0)
naught (1.0.0)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (2.9.2)
netrc (0.10.3)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
oauth2 (1.0.0)
@@ -351,12 +351,12 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rdoc (4.2.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rest-client (1.6.8)
mime-types (~> 1.16)
rdoc (>= 2.4.2)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rqrcode (0.4.2)
rspec (3.2.0)
rspec-core (~> 3.2.0)
@@ -383,6 +383,7 @@ GEM
rspec-support (~> 3.2.0)
rspec-support (3.2.2)
ruby-progressbar (1.7.1)
rubyzip (1.1.7)
safe_yaml (1.0.4)
sass (3.4.13)
sass-rails (5.0.1)
@@ -391,6 +392,11 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (~> 1.1)
selenium-webdriver (2.46.2)
childprocess (~> 0.5)
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0)
simplecov (0.9.2)
docile (~> 1.1.0)
multi_json (~> 1.0)
@@ -442,6 +448,9 @@ GEM
uglifier (2.7.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.1)
warden (1.2.3)
rack (>= 1.0)
web-console (2.0.0)
@@ -452,6 +461,7 @@ GEM
webmock (1.20.4)
addressable (>= 2.3.6)
crack (>= 0.3.2)
websocket (1.2.2)
websocket-driver (0.5.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
@@ -475,10 +485,9 @@ DEPENDENCIES
capistrano-rvm
capistrano3-puma
capybara-screenshot
capybara-webkit
cmtool!
coffee-rails
couch_potato!
couch_potato (~> 1.4.0)
devise
devise-i18n
devise_simply_stored!
@@ -517,6 +526,7 @@ DEPENDENCIES
rspec-its
rspec-rails
sass-rails (~> 5.0.0)
selenium-webdriver
simplecov
simply_stored!
slim-rails