bterkuile/cmtool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with latest simply_stored

Browse Source
This commit is contained in:
Benjamin ter Kuile
2015-07-22 17:21:41 +02:00
parent 49b61a5026
commit f7aa44ae2e
8 changed files with 115 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+20 -16
View File
@@ -1,12 +1,3 @@
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
@@ -22,7 +13,7 @@ GIT
GIT
remote: git://github.com/bterkuile/simply_stored.git
revision: 8e8288b20ab64d62f1da7516731cd936f81b1f19
revision: 05cb3a06a9d4a3588efd4491db42fac84276befb
specs:
simply_stored (1.0.0)
activesupport
@@ -100,6 +91,7 @@ GEM
xpath (~> 2.0)
climate_control (0.0.3)
activesupport (>= 3.0)
cliver (0.3.2)
cocaine (0.5.7)
climate_control (>= 0.0.3, < 1.0)
coderay (1.1.0)
@@ -107,6 +99,10 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.9.1.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)
@@ -168,6 +164,11 @@ GEM
mime-types
pickadate-rails (3.5.6.0)
railties (>= 3.1.0)
poltergeist (1.6.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
multi_json (~> 1.0)
websocket-driver (>= 0.2.0)
pry (0.10.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
@@ -208,18 +209,18 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
netrc (~> 0.7)
rspec-core (3.3.1)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-its (1.2.0)
rspec-core (>= 3.0.0)
rspec-expectations (>= 3.0.0)
rspec-mocks (3.3.1)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.2)
rspec-rails (3.3.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
@@ -259,7 +260,7 @@ GEM
thor (0.19.1)
thread_safe (0.3.5)
tilt (1.4.1)
tinymce-rails (4.1.6)
tinymce-rails (4.2.1)
railties (>= 3.1.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
@@ -268,6 +269,9 @@ GEM
unf_ext (0.0.7.1)
warden (1.2.3)
rack (>= 1.0)
websocket-driver (0.6.2)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -281,7 +285,6 @@ DEPENDENCIES
capybara
cmtool!
coffee-script
couch_potato!
devise
devise_simply_stored!
email_validator
@@ -293,6 +296,7 @@ DEPENDENCIES
orm_adapter!
paperclip (>= 3.4, != 4.3.0)
pickadate-rails
poltergeist
pry-rails
rails (~> 4.2.3)
rspec-its