Commit 6dbfd9f8
Changed files (2)
Gemfile
@@ -7,8 +7,9 @@ gem 'devise'
# gem 'heroku'
gem 'jquery-rails'
gem 'carrierwave'
-gem 'RedCloth', '>= 4.1.1'
-gem 'omniauth', '>=0.2.6'
+gem 'RedCloth'
+#gem 'omniauth'
+#gem 'omniauth-openid'
gem 'rmagick'
gem 'bcrypt-ruby'
gem 'json'
@@ -42,7 +43,7 @@ end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
- gem 'sass-rails', " ~> 3.1.0"
- gem 'coffee-rails', "~> 3.1.0"
+ gem 'sass-rails'
+ gem 'coffee-rails'
gem 'uglifier'
end
Gemfile.lock
@@ -2,54 +2,53 @@ GEM
remote: http://rubygems.org/
specs:
RedCloth (4.2.8)
- actionmailer (3.1.0)
- actionpack (= 3.1.0)
+ actionmailer (3.1.2)
+ actionpack (= 3.1.2)
mail (~> 2.3.0)
- actionpack (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ actionpack (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
builder (~> 3.0.0)
erubis (~> 2.7.0)
i18n (~> 0.6)
- rack (~> 1.3.2)
- rack-cache (~> 1.0.3)
+ rack (~> 1.3.5)
+ rack-cache (~> 1.1)
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.0)
- activemodel (3.1.0)
- activesupport (= 3.1.0)
- bcrypt-ruby (~> 3.0.0)
+ sprockets (~> 2.1.0)
+ activemodel (3.1.2)
+ activesupport (= 3.1.2)
builder (~> 3.0.0)
i18n (~> 0.6)
- activerecord (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
+ activerecord (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
arel (~> 2.2.1)
tzinfo (~> 0.3.29)
- activeresource (3.1.0)
- activemodel (= 3.1.0)
- activesupport (= 3.1.0)
- activesupport (3.1.0)
+ activeresource (3.1.2)
+ activemodel (= 3.1.2)
+ activesupport (= 3.1.2)
+ activesupport (3.1.2)
multi_json (~> 1.0)
- addressable (2.2.4)
- ansi (1.3.0)
+ addressable (2.2.6)
+ ansi (1.4.1)
arel (2.2.1)
bcrypt-ruby (3.0.1)
builder (3.0.0)
- capistrano (2.8.0)
+ capistrano (2.9.0)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
- capybara (1.1.1)
+ capybara (1.1.2)
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.5.7)
+ carrierwave (0.5.8)
activesupport (~> 3.0)
childprocess (0.2.2)
ffi (~> 1.0.6)
@@ -59,61 +58,58 @@ GEM
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.2)
- devise (1.4.6)
+ coffee-script-source (1.1.3)
+ devise (1.5.0)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
- warden (~> 1.0.3)
+ warden (~> 1.1)
diff-lcs (1.1.3)
- em-websocket (0.3.1)
+ em-websocket (0.3.5)
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
erubis (2.7.0)
eventmachine (0.12.10)
- excon (0.6.6)
- execjs (1.2.8)
+ excon (0.7.6)
+ execjs (1.2.9)
multi_json (~> 1.0)
- factory_girl (2.1.0)
- factory_girl_rails (1.2.0)
- factory_girl (~> 2.1.0)
+ factory_girl (2.2.0)
+ activesupport
+ factory_girl_rails (1.3.0)
+ factory_girl (~> 2.2.0)
railties (>= 3.0.0)
- faraday (0.6.1)
- addressable (~> 2.2.4)
- multipart-post (~> 1.1.0)
- rack (< 2, >= 1.1.0)
- ffi (1.0.9)
- fog (0.9.0)
+ ffi (1.0.11)
+ fog (1.1.1)
builder
- excon (~> 0.6.1)
- formatador (>= 0.1.3)
- json
+ excon (~> 0.7.4)
+ formatador (~> 0.2.0)
mime-types
- net-scp (>= 1.0.4)
- net-ssh (>= 2.1.4)
- nokogiri (>= 1.4.4)
+ multi_json (~> 1.0.3)
+ net-scp (~> 1.0.4)
+ net-ssh (>= 2.1.3)
+ nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.1)
growl (1.0.3)
- growl_notify (0.0.1)
+ growl_notify (0.0.3)
rb-appscript
- guard (0.7.0)
+ guard (0.8.8)
thor (~> 0.14.6)
guard-livereload (0.3.1)
em-websocket (>= 0.2.0)
guard (>= 0.4.0)
multi_json (~> 1.0.3)
- guard-rspec (0.4.5)
- guard (>= 0.4.0)
- highline (1.6.2)
+ guard-rspec (0.5.4)
+ guard (>= 0.8.4)
+ highline (1.6.8)
hike (1.2.1)
i18n (0.6.0)
- jasmine (1.1.0)
+ jasmine (1.1.2)
jasmine-core (>= 1.1.0)
rack (>= 1.1)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.1.0)
- jquery-rails (1.0.14)
+ jquery-rails (1.0.17)
railties (~> 3.0)
thor (~> 0.14)
json (1.6.1)
@@ -124,11 +120,8 @@ GEM
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
+ mime-types (1.17.2)
multi_json (1.0.3)
- multi_xml (0.2.2)
- multipart-post (1.1.3)
- net-ldap (0.2.2)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -136,136 +129,90 @@ GEM
net-ssh (2.2.1)
net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
- nokogiri (1.4.7)
- oa-basic (0.2.6)
- oa-core (= 0.2.6)
- rest-client (~> 1.6.0)
- oa-core (0.2.6)
- oa-enterprise (0.2.6)
- addressable (= 2.2.4)
- net-ldap (~> 0.2.2)
- nokogiri (~> 1.4.2)
- oa-core (= 0.2.6)
- pyu-ruby-sasl (~> 0.0.3.1)
- rubyntlm (~> 0.1.1)
- oa-more (0.2.6)
- multi_json (~> 1.0.0)
- oa-core (= 0.2.6)
- rest-client (~> 1.6.0)
- oa-oauth (0.2.6)
- faraday (~> 0.6.1)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.2.2)
- oa-core (= 0.2.6)
- oauth (~> 0.4.0)
- oauth2 (~> 0.4.1)
- oa-openid (0.2.6)
- oa-core (= 0.2.6)
- rack-openid (~> 1.3.1)
- ruby-openid-apps-discovery (~> 1.2.0)
- oauth (0.4.5)
- oauth2 (0.4.1)
- faraday (~> 0.6.1)
- multi_json (>= 0.0.5)
- omniauth (0.2.6)
- oa-basic (= 0.2.6)
- oa-core (= 0.2.6)
- oa-enterprise (= 0.2.6)
- oa-more (= 0.2.6)
- oa-oauth (= 0.2.6)
- oa-openid (= 0.2.6)
+ nokogiri (1.5.0)
orm_adapter (0.0.5)
pg (0.11.0)
- polyglot (0.3.2)
- pyu-ruby-sasl (0.0.3.3)
- rack (1.3.3)
- rack-cache (1.0.3)
+ polyglot (0.3.3)
+ rack (1.3.5)
+ rack-cache (1.1)
rack (>= 0.4)
rack-mount (0.8.3)
rack (>= 1.0.0)
- rack-openid (1.3.1)
- rack (>= 1.1.0)
- ruby-openid (>= 2.1.8)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0)
- actionmailer (= 3.1.0)
- actionpack (= 3.1.0)
- activerecord (= 3.1.0)
- activeresource (= 3.1.0)
- activesupport (= 3.1.0)
+ rails (3.1.2)
+ actionmailer (= 3.1.2)
+ actionpack (= 3.1.2)
+ activerecord (= 3.1.2)
+ activeresource (= 3.1.2)
+ activesupport (= 3.1.2)
bundler (~> 1.0)
- railties (= 3.1.0)
- railties (3.1.0)
- actionpack (= 3.1.0)
- activesupport (= 3.1.0)
+ railties (= 3.1.2)
+ railties (3.1.2)
+ actionpack (= 3.1.2)
+ activesupport (= 3.1.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
- rake (0.9.2)
+ rake (0.9.2.2)
rb-appscript (0.6.1)
rb-fsevent (0.4.3.1)
- rdoc (3.9.4)
- rest-client (1.6.7)
- mime-types (>= 1.16)
- riddle (1.4.0)
+ rdoc (3.11)
+ json (~> 1.4)
+ riddle (1.5.0)
rmagick (2.13.1)
- rspec (2.6.0)
- rspec-core (~> 2.6.0)
- rspec-expectations (~> 2.6.0)
- rspec-mocks (~> 2.6.0)
- rspec-core (2.6.4)
- rspec-expectations (2.6.0)
+ rspec (2.7.0)
+ rspec-core (~> 2.7.0)
+ rspec-expectations (~> 2.7.0)
+ rspec-mocks (~> 2.7.0)
+ rspec-core (2.7.1)
+ rspec-expectations (2.7.0)
diff-lcs (~> 1.1.2)
- rspec-mocks (2.6.0)
- rspec-rails (2.6.1)
+ rspec-mocks (2.7.0)
+ rspec-rails (2.7.0)
actionpack (~> 3.0)
activesupport (~> 3.0)
railties (~> 3.0)
- rspec (~> 2.6.0)
+ rspec (~> 2.7.0)
ruby-hmac (0.4.0)
- ruby-openid (2.1.8)
- ruby-openid-apps-discovery (1.2.0)
- ruby-openid (>= 2.1.7)
- rubyntlm (0.1.1)
rubyzip (0.9.4)
- sass (3.1.7)
- sass-rails (3.1.2)
+ sass (3.1.10)
+ sass-rails (3.1.5)
actionpack (~> 3.1.0)
railties (~> 3.1.0)
- sass (>= 3.1.4)
- sprockets (~> 2.0.0)
+ sass (~> 3.1.10)
tilt (~> 1.3.2)
- selenium-webdriver (2.6.0)
+ selenium-webdriver (2.12.2)
childprocess (>= 0.2.1)
- ffi (>= 1.0.7)
+ ffi (~> 1.0.9)
json_pure
rubyzip
- sprockets (2.0.0)
+ sprockets (2.1.0)
hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.4)
sqlite3-ruby (1.3.3)
sqlite3 (>= 1.3.3)
- thinking-sphinx (2.0.7)
+ thinking-sphinx (2.0.10)
activerecord (>= 3.0.3)
- riddle (>= 1.3.3)
+ builder (>= 2.1.2)
+ riddle (>= 1.5.0)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
- turn (0.8.2)
- ansi (>= 1.2.2)
- tzinfo (0.3.29)
- uglifier (1.0.3)
+ turn (0.8.3)
+ ansi
+ tzinfo (0.3.31)
+ uglifier (1.1.0)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
- warden (1.0.5)
+ warden (1.1.0)
rack (>= 1.0)
webrat (0.7.3)
nokogiri (>= 1.2.0)
@@ -278,12 +225,12 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth (>= 4.1.1)
+ RedCloth
bcrypt-ruby
capistrano
capybara
carrierwave
- coffee-rails (~> 3.1.0)
+ coffee-rails
devise
factory_girl_rails
fog
@@ -295,14 +242,13 @@ DEPENDENCIES
jquery-rails
json
kaminari
- omniauth (>= 0.2.6)
pg
rails
rake
rb-fsevent
rmagick
rspec-rails
- sass-rails (~> 3.1.0)
+ sass-rails
sqlite3-ruby
thinking-sphinx
turn