Commit 31310eb4
Changed files (2)
Gemfile
@@ -1,6 +1,6 @@
source 'https://rubygems.org'
-gem 'rails', '4.0.0'
+gem 'rails', '~> 4.0.0'
gem 'sass-rails', '~> 4.0.0'
gem 'uglifier', '>= 1.3.0'
gem 'coffee-rails', '~> 4.0.0'
@@ -12,13 +12,13 @@ group :doc do
gem 'sdoc', require: false
end
-gem 'devise'
-gem 'jquery-ui-rails'
+gem 'devise', '~> 3.0.0'
+gem 'jquery-ui-rails', '~> 4.0.0'
gem 'carrierwave'
gem 'carrierwave_backgrounder'
gem 'rmagick'
gem 'kaminari'
-gem 'bootstrap-sass'
+gem 'bootstrap-sass', '~> 2.0.0'
gem 'acts-as-taggable-on'
gem 'delayed_job', "~> 4.0.0.beta2"
gem 'delayed_job_active_record', "~> 4.0.0.beta3"
Gemfile.lock
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
- actionmailer (4.0.0)
- actionpack (= 4.0.0)
- mail (~> 2.5.3)
- actionpack (4.0.0)
- activesupport (= 4.0.0)
+ actionmailer (4.0.2)
+ actionpack (= 4.0.2)
+ mail (~> 2.5.4)
+ actionpack (4.0.2)
+ activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
- activemodel (4.0.0)
- activesupport (= 4.0.0)
+ activemodel (4.0.2)
+ activesupport (= 4.0.2)
builder (~> 3.1.0)
- activerecord (4.0.0)
- activemodel (= 4.0.0)
+ activerecord (4.0.2)
+ activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
- activesupport (= 4.0.0)
+ activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
- activesupport (4.0.0)
+ activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@@ -27,24 +27,23 @@ GEM
tzinfo (~> 0.3.37)
acts-as-taggable-on (2.4.1)
rails (>= 3, < 5)
- airbrake (3.1.12)
- activesupport
+ airbrake (3.1.14)
builder
json
- arel (4.0.0)
+ arel (4.0.1)
asset_sync (1.0.0)
activemodel
fog (>= 1.8.0)
- atomic (1.1.10)
- bcrypt-ruby (3.1.1)
- better_errors (0.9.0)
+ atomic (1.1.14)
+ bcrypt-ruby (3.1.2)
+ better_errors (1.1.0)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
- bootstrap-sass (2.3.2.1)
- sass (~> 3.2)
+ bootstrap-sass (2.0.4.2)
builder (3.1.4)
- bullet (4.6.0)
- uniform_notifier
+ bullet (4.7.1)
+ activesupport
+ uniform_notifier (>= 1.4.0)
capistrano (2.15.5)
highline
net-scp (>= 1.0.0)
@@ -53,7 +52,7 @@ GEM
net-ssh-gateway (>= 1.1.0)
capistrano-ext (1.2.1)
capistrano (>= 1.0.0)
- capybara (2.1.0)
+ capybara (2.2.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -63,56 +62,54 @@ GEM
activemodel (>= 3.2.0)
activesupport (>= 3.2.0)
json (>= 1.7)
- carrierwave_backgrounder (0.2.2)
+ carrierwave_backgrounder (0.3.0)
carrierwave (~> 0.5)
childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11)
- coderay (1.0.9)
- coffee-rails (4.0.0)
+ cliver (0.3.2)
+ coderay (1.1.0)
+ coffee-rails (4.0.1)
coffee-script (>= 2.2.0)
- railties (>= 4.0.0.beta, < 5.0)
+ railties (>= 4.0.0, < 5.0)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.6.3)
daemons (1.1.9)
dalli (2.6.4)
- database_cleaner (1.0.1)
- delayed_job (4.0.0.beta2)
+ database_cleaner (1.2.0)
+ delayed_job (4.0.0)
activesupport (>= 3.0, < 4.1)
- delayed_job_active_record (4.0.0.beta3)
+ delayed_job_active_record (4.0.0)
activerecord (>= 3.0, < 4.1)
delayed_job (>= 3.0, < 4.1)
- devise (3.0.0)
+ devise (3.0.4)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
warden (~> 1.2.3)
- diff-lcs (1.2.4)
- dotenv (0.8.0)
- dotenv-rails (0.8.0)
- dotenv (= 0.8.0)
+ diff-lcs (1.2.5)
+ docile (1.1.1)
+ dotenv (0.9.0)
+ dotenv-rails (0.9.0)
+ dotenv (= 0.9.0)
erubis (2.7.0)
- eventmachine (1.0.3)
- excon (0.25.3)
- execjs (1.4.0)
- multi_json (~> 1.0)
- factory_girl (4.2.0)
+ excon (0.31.0)
+ execjs (2.0.2)
+ factory_girl (4.3.0)
activesupport (>= 3.0.0)
- factory_girl_rails (4.2.1)
- factory_girl (~> 4.2.0)
+ factory_girl_rails (4.3.0)
+ factory_girl (~> 4.3.0)
railties (>= 3.0.0)
fakes (1.1.4)
fakes-rspec (1.0.5)
fakes
rspec
- faye-websocket (0.4.7)
- eventmachine (>= 0.12.0)
- ffaker (1.16.2)
+ ffaker (1.22.1)
ffi (1.9.3)
- fog (1.14.0)
+ fog (1.19.0)
builder
- excon (~> 0.25.0)
+ excon (~> 0.31.0)
formatador (~> 0.2.0)
mime-types
multi_json (~> 1.0)
@@ -121,12 +118,11 @@ GEM
nokogiri (~> 1.5)
ruby-hmac
formatador (0.2.4)
- geocoder (1.1.8)
- highline (1.6.19)
+ geocoder (1.1.9)
+ highline (1.6.20)
hike (1.2.3)
- http_parser.rb (0.5.3)
- i18n (0.6.4)
- jbuilder (1.4.2)
+ i18n (0.6.9)
+ jbuilder (1.5.3)
activesupport (>= 3.0.0)
multi_json (>= 1.2.0)
jquery-fileupload-rails (0.4.1)
@@ -135,64 +131,63 @@ GEM
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
- jquery-ui-rails (4.0.4)
- jquery-rails
+ jquery-ui-rails (4.0.5)
railties (>= 3.1.0)
- json (1.8.0)
- kaminari (0.14.1)
+ json (1.8.1)
+ kaminari (0.15.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- kgio (2.8.0)
- lol_dba (1.5.0)
+ kgio (2.8.1)
+ lol_dba (1.6.0)
actionpack (>= 3.0)
activerecord (>= 3.0)
railties (>= 3.0)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.23)
- mini_portile (0.5.1)
+ mime-types (1.25.1)
+ mini_portile (0.5.2)
minitest (4.7.5)
- multi_json (1.7.9)
+ multi_json (1.8.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
- net-ssh (2.6.8)
+ net-ssh (2.7.0)
net-ssh-gateway (1.2.0)
net-ssh (>= 2.6.5)
- newrelic_rpm (3.6.6.147)
- nokogiri (1.6.0)
+ newrelic_rpm (3.7.1.180)
+ nokogiri (1.6.1)
mini_portile (~> 0.5.0)
- orm_adapter (0.4.0)
- pg (0.16.0)
- phantomjs (1.8.1.1)
- poltergeist
- poltergeist (1.3.0)
- capybara (~> 2.1.0)
- faye-websocket (>= 0.4.4, < 0.5.0)
- http_parser.rb (~> 0.5.3)
+ orm_adapter (0.5.0)
+ pg (0.17.1)
+ phantomjs (1.9.2.1)
+ poltergeist (1.5.0)
+ capybara (~> 2.1)
+ cliver (~> 0.3.1)
+ multi_json (~> 1.0)
+ websocket-driver (>= 0.2.0)
polyglot (0.3.3)
rack (1.5.2)
- rack-mini-profiler (0.1.27)
+ rack-mini-profiler (0.1.31)
rack (>= 1.1.3)
rack-test (0.6.2)
rack (>= 1.0)
- rails (4.0.0)
- actionmailer (= 4.0.0)
- actionpack (= 4.0.0)
- activerecord (= 4.0.0)
- activesupport (= 4.0.0)
+ rails (4.0.2)
+ actionmailer (= 4.0.2)
+ actionpack (= 4.0.2)
+ activerecord (= 4.0.2)
+ activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
- railties (= 4.0.0)
+ railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
- railties (4.0.0)
- actionpack (= 4.0.0)
- activesupport (= 4.0.0)
+ railties (4.0.2)
+ actionpack (= 4.0.2)
+ activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
- raindrops (0.11.0)
- rake (10.1.0)
+ raindrops (0.12.0)
+ rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rmagick (2.13.2)
@@ -200,10 +195,10 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
- rspec-core (2.14.4)
- rspec-expectations (2.14.0)
+ rspec-core (2.14.7)
+ rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
- rspec-mocks (2.14.1)
+ rspec-mocks (2.14.4)
rspec-rails (2.14.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
@@ -213,11 +208,11 @@ GEM
rspec-mocks (~> 2.14.0)
ruby-hmac (0.4.0)
rubyzip (1.1.0)
- rvm-capistrano (1.4.1)
- capistrano (>= 2.0.0)
- sass (3.2.10)
- sass-rails (4.0.0)
- railties (>= 4.0.0.beta, < 5.0)
+ rvm-capistrano (1.5.1)
+ capistrano (~> 2.15.4)
+ sass (3.2.13)
+ sass-rails (4.0.1)
+ railties (>= 4.0.0, < 5.0)
sass (>= 3.1.10)
sprockets-rails (~> 2.0.0)
sdoc (0.3.20)
@@ -228,44 +223,46 @@ GEM
multi_json (~> 1.0)
rubyzip (~> 1.0)
websocket (~> 1.0.4)
- simplecov (0.7.1)
- multi_json (~> 1.0)
- simplecov-html (~> 0.7.1)
- simplecov-html (0.7.1)
- sprockets (2.10.0)
+ simplecov (0.8.2)
+ docile (~> 1.1.0)
+ multi_json
+ simplecov-html (~> 0.8.0)
+ simplecov-html (0.8.0)
+ sprockets (2.10.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
- sprockets-rails (2.0.0)
+ sprockets-rails (2.0.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (~> 2.8)
- sqlite3 (1.3.7)
- teaspoon (0.7.4)
+ sqlite3 (1.3.8)
+ teaspoon (0.7.8)
phantomjs (>= 1.8.1.1)
railties (>= 3.2.5, < 5)
thor (0.18.1)
- thread_safe (0.1.2)
+ thread_safe (0.1.3)
atomic
tilt (1.4.1)
- treetop (1.4.14)
+ treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
- turbolinks (1.3.0)
+ turbolinks (2.1.0)
coffee-rails
- tzinfo (0.3.37)
- uglifier (2.1.2)
+ tzinfo (0.3.38)
+ uglifier (2.4.0)
execjs (>= 0.3.0)
- multi_json (~> 1.0, >= 1.0.2)
- unicorn (4.6.3)
+ json (>= 1.8.0)
+ unicorn (4.7.0)
kgio (~> 2.6)
rack
raindrops (~> 0.7)
- uniform_notifier (1.2.0)
+ uniform_notifier (1.4.0)
warden (1.2.3)
rack (>= 1.0)
websocket (1.0.7)
+ websocket-driver (0.3.1)
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -277,7 +274,7 @@ DEPENDENCIES
airbrake
asset_sync
better_errors
- bootstrap-sass
+ bootstrap-sass (~> 2.0.0)
bullet
capistrano
capistrano-ext
@@ -290,7 +287,7 @@ DEPENDENCIES
database_cleaner
delayed_job (~> 4.0.0.beta2)
delayed_job_active_record (~> 4.0.0.beta3)
- devise
+ devise (~> 3.0.0)
dotenv-rails
factory_girl_rails
fakes-rspec
@@ -300,14 +297,14 @@ DEPENDENCIES
jbuilder (~> 1.2)
jquery-fileupload-rails
jquery-rails
- jquery-ui-rails
+ jquery-ui-rails (~> 4.0.0)
kaminari
lol_dba
newrelic_rpm
pg
poltergeist
rack-mini-profiler
- rails (= 4.0.0)
+ rails (~> 4.0.0)
rmagick
rspec-rails
rvm-capistrano