[#345] update rails & other gems
This commit is contained in:
parent
3798409876
commit
83689a94c4
81
Gemfile
81
Gemfile
|
@ -1,71 +1,65 @@
|
||||||
source 'https://rubygems.org'
|
source 'https://rubygems.org'
|
||||||
|
|
||||||
gem 'rails', '3.2.17'
|
gem 'rails', '4.0.3'
|
||||||
gem 'redhillonrails_core', git: 'git://github.com/rosa-abf/redhillonrails_core.git', branch: 'rails31' # '~> 2.0.0.pre' # deprecated
|
gem 'redhillonrails_core', git: 'git://github.com/rosa-abf/redhillonrails_core.git', branch: 'rails31' # '~> 2.0.0.pre' # deprecated
|
||||||
|
|
||||||
gem 'pg', '~> 0.14.0'
|
gem 'pg', '~> 0.17.1'
|
||||||
gem 'activerecord-postgres-hstore'
|
|
||||||
|
|
||||||
gem 'devise', '~> 2.2.3'
|
gem 'devise', '~> 3.2.3'
|
||||||
gem 'omniauth'
|
gem 'omniauth'
|
||||||
gem 'omniauth-facebook'
|
gem 'omniauth-facebook'
|
||||||
gem 'omniauth-google-oauth2'
|
gem 'omniauth-google-oauth2'
|
||||||
gem 'omniauth-github'
|
gem 'omniauth-github'
|
||||||
# gem 'omniauth-openid', '~> 1.0.1'
|
# gem 'omniauth-openid', '~> 1.0.1'
|
||||||
gem 'cancan', '1.6.7' # 1.6.8 fail specs with strange error
|
gem 'cancan', '1.6.10'
|
||||||
|
|
||||||
gem 'ancestry', '~> 1.3.0'
|
gem 'ancestry', '~> 2.0.0'
|
||||||
gem 'paperclip', '~> 4.1.0'
|
gem 'paperclip', '~> 4.1.1'
|
||||||
gem 'resque', '~> 1.24'
|
gem 'resque', '~> 1.25'
|
||||||
gem 'resque-status', '~> 0.3.3'
|
gem 'resque-status', '~> 0.4.2'
|
||||||
gem 'resque_mailer', '~> 2.2'
|
gem 'resque_mailer', '~> 2.2'
|
||||||
gem 'resque-scheduler'
|
gem 'resque-scheduler', '~> 2.5.4'
|
||||||
# gem 'perform_later', '~> 1.3.0' # should be after resque_mailer
|
|
||||||
gem 'perform_later', git: 'git://github.com/KensoDev/perform_later.git' # should be after resque_mailer
|
gem 'perform_later', git: 'git://github.com/KensoDev/perform_later.git' # should be after resque_mailer
|
||||||
gem 'russian', '~> 0.6.0'
|
gem 'russian', '~> 0.6.0'
|
||||||
gem 'highline', '~> 1.6.11'
|
gem 'highline', '~> 1.6.20'
|
||||||
gem 'state_machine'
|
gem 'state_machine', '~> 1.2'
|
||||||
gem 'redis-rails'
|
gem 'redis-rails', '~> 4.0'
|
||||||
|
|
||||||
gem 'grack', git: 'git://github.com/rosa-abf/grack.git', require: 'git_http'
|
gem 'grack', git: 'git://github.com/rosa-abf/grack.git', require: 'git_http'
|
||||||
gem 'grit', git: 'git://github.com/rosa-abf/grit.git'
|
gem 'grit', git: 'git://github.com/rosa-abf/grit.git'
|
||||||
gem 'charlock_holmes', '~> 0.6.9'
|
gem 'charlock_holmes', '~> 0.6.9'
|
||||||
gem 'github-linguist', '~> 2.3.4', require: 'linguist'
|
gem 'github-linguist', '~> 2.10', require: 'linguist'
|
||||||
gem 'diff-display', '~> 0.0.1'
|
gem 'diff-display', '~> 0.0.1'
|
||||||
|
|
||||||
# Wiki
|
# Wiki
|
||||||
gem "gollum", '~> 2.1.3'
|
gem "gollum", '~> 2.7.0'
|
||||||
gem "redcarpet", '~> 2.2.2'
|
gem "redcarpet", '~> 3.1.1'
|
||||||
gem 'creole'
|
gem 'creole'
|
||||||
gem 'rdiscount'
|
gem 'rdiscount'
|
||||||
# gem 'org-ruby'
|
# gem 'org-ruby'
|
||||||
gem 'RedCloth'
|
gem 'RedCloth'
|
||||||
gem 'wikicloth'
|
gem 'wikicloth'
|
||||||
|
|
||||||
# gem 'unicorn', '~> 4.3.1', platforms: [:mri, :rbx]
|
|
||||||
gem 'trinidad', '~> 1.0.2', platforms: :jruby
|
|
||||||
|
|
||||||
gem 'newrelic_rpm'
|
gem 'newrelic_rpm'
|
||||||
# gem 'whenever', '~> 0.7.3', require: false
|
|
||||||
gem 'whenever', '~> 0.9.0', require: false
|
gem 'whenever', '~> 0.9.0', require: false
|
||||||
|
|
||||||
gem 'jbuilder', '~> 1.4.2'
|
gem 'jbuilder', '~> 2.0.3'
|
||||||
gem 'rails3-jquery-autocomplete', '~> 1.0.7'
|
gem 'rails3-jquery-autocomplete', '~> 1.0'
|
||||||
gem 'will_paginate', '~> 3.0.3'
|
gem 'will_paginate', '~> 3.0.5'
|
||||||
gem 'meta-tags', '~> 1.2.5', require: 'meta_tags'
|
gem 'meta-tags', '~> 1.5', require: 'meta_tags'
|
||||||
gem "haml-rails", '~> 0.3.4'
|
gem "haml-rails", '~> 0.5'
|
||||||
gem 'jquery-rails', '~> 2.0.2'
|
gem 'jquery-rails', '~> 3.1'
|
||||||
gem 'ruby-haml-js', '~> 0.0.3'
|
gem 'ruby-haml-js', '~> 0.0.5'
|
||||||
gem 'friendly_id'
|
gem 'friendly_id', '~> 5.0.3'
|
||||||
|
|
||||||
gem 'rack-throttle'
|
gem 'rack-throttle', '~> 0.3.0'
|
||||||
gem 'rest-client', '~> 1.6.6'
|
gem 'rest-client', '~> 1.6.7'
|
||||||
gem 'ohm'
|
gem 'ohm', '~> 1.3.2'
|
||||||
gem 'ohm-expire'
|
gem 'ohm-expire', '~> 0.1.3'
|
||||||
|
|
||||||
gem 'ffi'
|
gem 'ffi', '~> 1.9.3'
|
||||||
|
|
||||||
gem 'attr_encrypted', '1.2.1'
|
gem 'attr_encrypted', '~> 1.3.2'
|
||||||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
|
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
|
||||||
|
|
||||||
# AngularJS related stuff
|
# AngularJS related stuff
|
||||||
|
@ -80,13 +74,12 @@ gem 'soundmanager-rails'
|
||||||
gem 'time_diff'
|
gem 'time_diff'
|
||||||
|
|
||||||
group :assets do
|
group :assets do
|
||||||
gem 'sass-rails', '~> 3.2.5'
|
gem 'sass-rails', '~> 4.0.1'
|
||||||
gem 'coffee-rails', '~> 3.2.2'
|
gem 'coffee-rails', '~> 4.0.1'
|
||||||
gem 'compass-rails', '~> 1.0.3'
|
gem 'compass-rails', '~> 1.1.3'
|
||||||
gem 'uglifier', '~> 1.2.4'
|
gem 'uglifier', '~> 2.4'
|
||||||
gem 'therubyracer', '~> 0.10.2', platforms: [:mri, :rbx]
|
gem 'therubyracer', '~> 0.10.2', platforms: [:mri, :rbx]
|
||||||
gem 'therubyrhino', '~> 1.73.1', platforms: :jruby
|
gem 'therubyrhino', '~> 1.73.1', platforms: :jruby
|
||||||
gem 'turbo-sprockets-rails3'
|
|
||||||
end
|
end
|
||||||
|
|
||||||
group :production do
|
group :production do
|
||||||
|
@ -115,10 +108,10 @@ group :development do
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem 'rspec-rails', '~> 2.11.0', group: 'development'
|
gem 'rspec-rails', '~> 2.14.1', group: 'development'
|
||||||
gem 'factory_girl_rails', '~> 4.0.0'
|
gem 'factory_girl_rails', '~> 4.4.1'
|
||||||
gem 'rr', '~> 1.0.4'
|
gem 'rr', '~> 1.1.2'
|
||||||
gem 'shoulda'
|
gem 'shoulda'
|
||||||
gem 'mock_redis', '0.6.2'
|
gem 'mock_redis', '~> 0.11'
|
||||||
gem 'rake'
|
gem 'rake'
|
||||||
end
|
end
|
||||||
|
|
454
Gemfile.lock
454
Gemfile.lock
|
@ -35,62 +35,57 @@ GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
RedCloth (4.2.9)
|
RedCloth (4.2.9)
|
||||||
actionmailer (3.2.17)
|
actionmailer (4.0.3)
|
||||||
actionpack (= 3.2.17)
|
actionpack (= 4.0.3)
|
||||||
mail (~> 2.5.4)
|
mail (~> 2.5.4)
|
||||||
actionpack (3.2.17)
|
actionpack (4.0.3)
|
||||||
activemodel (= 3.2.17)
|
activesupport (= 4.0.3)
|
||||||
activesupport (= 3.2.17)
|
builder (~> 3.1.0)
|
||||||
builder (~> 3.0.0)
|
|
||||||
erubis (~> 2.7.0)
|
erubis (~> 2.7.0)
|
||||||
journey (~> 1.0.4)
|
rack (~> 1.5.2)
|
||||||
rack (~> 1.4.5)
|
rack-test (~> 0.6.2)
|
||||||
rack-cache (~> 1.2)
|
activemodel (4.0.3)
|
||||||
rack-test (~> 0.6.1)
|
activesupport (= 4.0.3)
|
||||||
sprockets (~> 2.2.1)
|
builder (~> 3.1.0)
|
||||||
activemodel (3.2.17)
|
activerecord (4.0.3)
|
||||||
activesupport (= 3.2.17)
|
activemodel (= 4.0.3)
|
||||||
builder (~> 3.0.0)
|
activerecord-deprecated_finders (~> 1.0.2)
|
||||||
activerecord (3.2.17)
|
activesupport (= 4.0.3)
|
||||||
activemodel (= 3.2.17)
|
arel (~> 4.0.0)
|
||||||
activesupport (= 3.2.17)
|
activerecord-deprecated_finders (1.0.3)
|
||||||
arel (~> 3.0.2)
|
activesupport (4.0.3)
|
||||||
tzinfo (~> 0.3.29)
|
|
||||||
activerecord-postgres-hstore (0.7.7)
|
|
||||||
activerecord (>= 3.1)
|
|
||||||
pg-hstore (>= 1.1.5)
|
|
||||||
rake
|
|
||||||
activeresource (3.2.17)
|
|
||||||
activemodel (= 3.2.17)
|
|
||||||
activesupport (= 3.2.17)
|
|
||||||
activesupport (3.2.17)
|
|
||||||
i18n (~> 0.6, >= 0.6.4)
|
i18n (~> 0.6, >= 0.6.4)
|
||||||
multi_json (~> 1.0)
|
minitest (~> 4.2)
|
||||||
|
multi_json (~> 1.3)
|
||||||
|
thread_safe (~> 0.1)
|
||||||
|
tzinfo (~> 0.3.37)
|
||||||
airbrake (3.1.15)
|
airbrake (3.1.15)
|
||||||
builder
|
builder
|
||||||
multi_json
|
multi_json
|
||||||
ancestry (1.3.0)
|
ancestry (2.0.0)
|
||||||
activerecord (>= 2.3.14)
|
activerecord (>= 3.0.0)
|
||||||
angular-i18n (0.1.2)
|
angular-i18n (0.1.2)
|
||||||
angularjs-rails (1.2.7)
|
angularjs-rails (1.2.7)
|
||||||
arel (3.0.3)
|
arel (4.0.2)
|
||||||
attr_encrypted (1.2.1)
|
atomic (1.1.15)
|
||||||
encryptor (>= 1.1.1)
|
attr_encrypted (1.3.2)
|
||||||
bcrypt-ruby (3.1.2)
|
encryptor (>= 1.3.0)
|
||||||
|
bcrypt (3.1.7)
|
||||||
|
bcrypt-ruby (3.1.5)
|
||||||
|
bcrypt (>= 3.1.3)
|
||||||
better_errors (1.1.0)
|
better_errors (1.1.0)
|
||||||
coderay (>= 1.0.0)
|
coderay (>= 1.0.0)
|
||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
blankslate (3.1.2)
|
bluepill (0.0.64)
|
||||||
bluepill (0.0.66)
|
activesupport (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0, < 4.0.0)
|
|
||||||
daemons (~> 1.1.4)
|
daemons (~> 1.1.4)
|
||||||
i18n (>= 0.5.0)
|
i18n (>= 0.5.0)
|
||||||
state_machine (~> 1.1)
|
state_machine (~> 1.1)
|
||||||
builder (3.0.4)
|
builder (3.1.4)
|
||||||
callsite (0.0.11)
|
callsite (0.0.11)
|
||||||
cancan (1.6.7)
|
cancan (1.6.10)
|
||||||
cape (1.8.0)
|
cape (1.8.0)
|
||||||
capistrano (2.15.5)
|
capistrano (2.15.5)
|
||||||
highline
|
highline
|
||||||
|
@ -101,99 +96,105 @@ GEM
|
||||||
capistrano_colors (0.5.5)
|
capistrano_colors (0.5.5)
|
||||||
charlock_holmes (0.6.9.4)
|
charlock_holmes (0.6.9.4)
|
||||||
chronic (0.10.2)
|
chronic (0.10.2)
|
||||||
chunky_png (1.2.9)
|
chunky_png (1.3.0)
|
||||||
climate_control (0.0.3)
|
climate_control (0.0.3)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
cocaine (0.5.3)
|
cocaine (0.5.3)
|
||||||
climate_control (>= 0.0.3, < 1.0)
|
climate_control (>= 0.0.3, < 1.0)
|
||||||
coderay (1.1.0)
|
coderay (1.1.0)
|
||||||
coffee-rails (3.2.2)
|
coffee-rails (4.0.1)
|
||||||
coffee-script (>= 2.2.0)
|
coffee-script (>= 2.2.0)
|
||||||
railties (~> 3.2.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
coffee-script (2.2.0)
|
coffee-script (2.2.0)
|
||||||
coffee-script-source
|
coffee-script-source
|
||||||
execjs
|
execjs
|
||||||
coffee-script-source (1.6.3)
|
coffee-script-source (1.7.0)
|
||||||
compass (0.12.2)
|
compass (0.12.2)
|
||||||
chunky_png (~> 1.2)
|
chunky_png (~> 1.2)
|
||||||
fssm (>= 0.2.7)
|
fssm (>= 0.2.7)
|
||||||
sass (~> 3.1)
|
sass (~> 3.1)
|
||||||
compass-rails (1.0.3)
|
compass-rails (1.1.3)
|
||||||
compass (>= 0.12.2, < 0.14)
|
compass (>= 0.12.2)
|
||||||
creole (0.5.0)
|
creole (0.5.0)
|
||||||
daemons (1.1.9)
|
daemons (1.1.9)
|
||||||
debug_inspector (0.0.2)
|
debug_inspector (0.0.2)
|
||||||
devise (2.2.8)
|
devise (3.2.3)
|
||||||
bcrypt-ruby (~> 3.0)
|
bcrypt-ruby (~> 3.0)
|
||||||
orm_adapter (~> 0.1)
|
orm_adapter (~> 0.1)
|
||||||
railties (~> 3.1)
|
railties (>= 3.2.6, < 5)
|
||||||
warden (~> 1.2.1)
|
thread_safe (~> 0.1)
|
||||||
|
warden (~> 1.2.3)
|
||||||
diff-display (0.0.1)
|
diff-display (0.0.1)
|
||||||
diff-lcs (1.1.3)
|
diff-lcs (1.2.5)
|
||||||
encryptor (1.3.0)
|
encryptor (1.3.0)
|
||||||
erubis (2.7.0)
|
erubis (2.7.0)
|
||||||
escape_utils (0.2.4)
|
escape_utils (1.0.1)
|
||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
expression_parser (0.9.0)
|
expression_parser (0.9.0)
|
||||||
factory_girl (4.0.0)
|
factory_girl (4.4.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
factory_girl_rails (4.0.0)
|
factory_girl_rails (4.4.1)
|
||||||
factory_girl (~> 4.0.0)
|
factory_girl (~> 4.4.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faraday (0.8.9)
|
faraday (0.9.0)
|
||||||
multipart-post (~> 1.2.0)
|
multipart-post (>= 1.2, < 3)
|
||||||
ffi (1.0.11)
|
ffi (1.9.3)
|
||||||
friendly_id (4.0.10.1)
|
friendly_id (5.0.3)
|
||||||
activerecord (>= 3.0, < 4.0)
|
activerecord (>= 4.0.0)
|
||||||
fssm (0.2.10)
|
fssm (0.2.10)
|
||||||
gemoji (1.2.1)
|
gemoji (1.2.1)
|
||||||
github-linguist (2.3.4)
|
github-linguist (2.10.9)
|
||||||
charlock_holmes (~> 0.6.6)
|
charlock_holmes (~> 0.6.6)
|
||||||
escape_utils (~> 0.2.3)
|
escape_utils (>= 0.3.1)
|
||||||
mime-types (~> 1.19)
|
mime-types (~> 1.19)
|
||||||
pygments.rb (>= 0.2.13)
|
pygments.rb (~> 0.5.4)
|
||||||
github-markdown (0.6.3)
|
github-markdown (0.5.5)
|
||||||
github-markup (0.7.5)
|
github-markup (0.7.5)
|
||||||
gli (2.8.1)
|
gitlab-grit (2.6.0)
|
||||||
gollum (2.1.10)
|
charlock_holmes (~> 0.6.9)
|
||||||
github-markdown
|
diff-lcs (~> 1.1)
|
||||||
github-markup (>= 0.7.0, < 1.0.0)
|
mime-types (~> 1.15)
|
||||||
grit (~> 2.5.0)
|
posix-spawn (~> 0.3.6)
|
||||||
mustache (>= 0.11.2, < 1.0.0)
|
gli (2.9.0)
|
||||||
nokogiri (~> 1.4)
|
gollum (2.7.0)
|
||||||
posix-spawn (~> 0.3.0)
|
github-markdown (~> 0.5.5)
|
||||||
pygments.rb (~> 0.2.0)
|
gollum-lib (~> 2.0)
|
||||||
sanitize (~> 2.0.0)
|
mustache (>= 0.99.4, < 1.0.0)
|
||||||
sinatra (~> 1.0)
|
sinatra (~> 1.4, >= 1.4.3)
|
||||||
stringex (~> 1.4.0)
|
useragent (~> 0.8.2)
|
||||||
useragent (~> 0.4.9)
|
gollum-lib (2.0.0)
|
||||||
haml (3.1.8)
|
github-markup (>= 0.7.5, < 1.0.0)
|
||||||
haml-rails (0.3.5)
|
gitlab-grit (= 2.6.0)
|
||||||
actionpack (>= 3.1, < 4.1)
|
nokogiri (~> 1.6.0)
|
||||||
activesupport (>= 3.1, < 4.1)
|
rouge (~> 1.3.1)
|
||||||
haml (~> 3.1)
|
sanitize (~> 2.0.6)
|
||||||
railties (>= 3.1, < 4.1)
|
stringex (~> 2.1.0)
|
||||||
|
haml (4.0.5)
|
||||||
|
tilt
|
||||||
|
haml-rails (0.5.3)
|
||||||
|
actionpack (>= 4.0.1)
|
||||||
|
activesupport (>= 4.0.1)
|
||||||
|
haml (>= 3.1, < 5.0)
|
||||||
|
railties (>= 4.0.1)
|
||||||
hashie (2.0.5)
|
hashie (2.0.5)
|
||||||
highline (1.6.20)
|
highline (1.6.20)
|
||||||
hike (1.2.3)
|
hike (1.2.3)
|
||||||
hirb (0.7.1)
|
hirb (0.7.1)
|
||||||
httpauth (0.2.0)
|
|
||||||
i18n (0.6.9)
|
i18n (0.6.9)
|
||||||
jbuilder (1.4.2)
|
jbuilder (2.0.3)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
multi_json (>= 1.2.0)
|
multi_json (>= 1.2.0)
|
||||||
journey (1.0.4)
|
jquery-rails (3.1.0)
|
||||||
jquery-rails (2.0.3)
|
railties (>= 3.0, < 5.0)
|
||||||
railties (>= 3.1.0, < 5.0)
|
thor (>= 0.14, < 2.0)
|
||||||
thor (~> 0.14)
|
|
||||||
js-routes (0.9.6)
|
js-routes (0.9.6)
|
||||||
rails (>= 3.2)
|
rails (>= 3.2)
|
||||||
json (1.8.1)
|
json (1.8.1)
|
||||||
jwt (0.1.10)
|
jwt (0.1.11)
|
||||||
multi_json (>= 1.5)
|
multi_json (>= 1.5)
|
||||||
libv8 (3.3.10.4)
|
libv8 (3.3.10.4)
|
||||||
localeapp (0.6.14)
|
localeapp (0.7.1)
|
||||||
gli
|
gli
|
||||||
i18n
|
i18n
|
||||||
json
|
json
|
||||||
|
@ -201,21 +202,20 @@ GEM
|
||||||
rest-client
|
rest-client
|
||||||
ya2yaml
|
ya2yaml
|
||||||
logglier (0.2.11)
|
logglier (0.2.11)
|
||||||
macaddr (1.6.1)
|
|
||||||
systemu (~> 2.5.0)
|
|
||||||
mail (2.5.4)
|
mail (2.5.4)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
treetop (~> 1.4.8)
|
treetop (~> 1.4.8)
|
||||||
mailcatcher (0.5.12)
|
mailcatcher (0.2.4)
|
||||||
activesupport (~> 3.0)
|
eventmachine
|
||||||
eventmachine (~> 1.0.0)
|
haml
|
||||||
haml (>= 3.1, < 5)
|
i18n
|
||||||
mail (~> 2.3)
|
json
|
||||||
sinatra (~> 1.2)
|
mail
|
||||||
skinny (~> 0.2.3)
|
sinatra
|
||||||
sqlite3 (~> 1.3)
|
skinny (>= 0.1.2)
|
||||||
thin (~> 1.5.0)
|
sqlite3-ruby
|
||||||
meta-tags (1.2.6)
|
thin
|
||||||
|
meta-tags (1.5.0)
|
||||||
actionpack
|
actionpack
|
||||||
meta_request (0.2.8)
|
meta_request (0.2.8)
|
||||||
callsite
|
callsite
|
||||||
|
@ -223,12 +223,14 @@ GEM
|
||||||
railties
|
railties
|
||||||
mime-types (1.25.1)
|
mime-types (1.25.1)
|
||||||
mini_portile (0.5.2)
|
mini_portile (0.5.2)
|
||||||
mock_redis (0.6.2)
|
minitest (4.7.5)
|
||||||
|
mock_redis (0.11.0)
|
||||||
momentjs-rails (2.5.0)
|
momentjs-rails (2.5.0)
|
||||||
railties (>= 3.1)
|
railties (>= 3.1)
|
||||||
mono_logger (1.1.0)
|
mono_logger (1.1.0)
|
||||||
multi_json (1.8.4)
|
multi_json (1.8.4)
|
||||||
multipart-post (1.2.0)
|
multi_xml (0.5.5)
|
||||||
|
multipart-post (2.0.0)
|
||||||
mustache (0.99.5)
|
mustache (0.99.5)
|
||||||
nest (1.1.2)
|
nest (1.1.2)
|
||||||
redis
|
redis
|
||||||
|
@ -236,18 +238,18 @@ GEM
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-sftp (2.1.2)
|
net-sftp (2.1.2)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
net-ssh (2.7.0)
|
net-ssh (2.8.0)
|
||||||
net-ssh-gateway (1.2.0)
|
net-ssh-gateway (1.2.0)
|
||||||
net-ssh (>= 2.6.5)
|
net-ssh (>= 2.6.5)
|
||||||
newrelic_rpm (3.7.1.182)
|
newrelic_rpm (3.7.2.195)
|
||||||
ng-rails-csrf (0.1.0)
|
ng-rails-csrf (0.1.0)
|
||||||
nokogiri (1.6.1)
|
nokogiri (1.6.1)
|
||||||
mini_portile (~> 0.5.0)
|
mini_portile (~> 0.5.0)
|
||||||
oauth2 (0.8.1)
|
oauth2 (0.9.3)
|
||||||
faraday (~> 0.8)
|
faraday (>= 0.8, < 0.10)
|
||||||
httpauth (~> 0.1)
|
jwt (~> 0.1.8)
|
||||||
jwt (~> 0.1.4)
|
multi_json (~> 1.3)
|
||||||
multi_json (~> 1.0)
|
multi_xml (~> 0.5)
|
||||||
rack (~> 1.2)
|
rack (~> 1.2)
|
||||||
ohm (1.3.2)
|
ohm (1.3.2)
|
||||||
nest (~> 1.0)
|
nest (~> 1.0)
|
||||||
|
@ -255,9 +257,9 @@ GEM
|
||||||
scrivener (~> 0.0.3)
|
scrivener (~> 0.0.3)
|
||||||
ohm-expire (0.1.3.2)
|
ohm-expire (0.1.3.2)
|
||||||
ohm (>= 0.1.5)
|
ohm (>= 0.1.5)
|
||||||
omniauth (1.1.4)
|
omniauth (1.2.1)
|
||||||
hashie (>= 1.2, < 3)
|
hashie (>= 1.2, < 3)
|
||||||
rack
|
rack (~> 1.0)
|
||||||
omniauth-facebook (1.6.0)
|
omniauth-facebook (1.6.0)
|
||||||
omniauth-oauth2 (~> 1.1)
|
omniauth-oauth2 (~> 1.1)
|
||||||
omniauth-github (1.1.1)
|
omniauth-github (1.1.1)
|
||||||
|
@ -266,121 +268,107 @@ GEM
|
||||||
omniauth-google-oauth2 (0.2.2)
|
omniauth-google-oauth2 (0.2.2)
|
||||||
omniauth (~> 1.0)
|
omniauth (~> 1.0)
|
||||||
omniauth-oauth2
|
omniauth-oauth2
|
||||||
omniauth-oauth2 (1.1.1)
|
omniauth-oauth2 (1.1.2)
|
||||||
oauth2 (~> 0.8.0)
|
faraday (>= 0.8, < 0.10)
|
||||||
omniauth (~> 1.0)
|
multi_json (~> 1.3)
|
||||||
|
oauth2 (~> 0.9.3)
|
||||||
|
omniauth (~> 1.2)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
paperclip (4.1.0)
|
paperclip (4.1.1)
|
||||||
activemodel (>= 3.0.0)
|
activemodel (>= 3.0.0)
|
||||||
activesupport (>= 3.0.0)
|
activesupport (>= 3.0.0)
|
||||||
cocaine (~> 0.5.3)
|
cocaine (~> 0.5.3)
|
||||||
mime-types
|
mime-types
|
||||||
pg (0.14.1)
|
pg (0.17.1)
|
||||||
pg-hstore (1.2.0)
|
|
||||||
polyglot (0.3.4)
|
polyglot (0.3.4)
|
||||||
posix-spawn (0.3.8)
|
posix-spawn (0.3.8)
|
||||||
puma (2.7.1)
|
puma (2.7.1)
|
||||||
rack (>= 1.1, < 2.0)
|
rack (>= 1.1, < 2.0)
|
||||||
pygments.rb (0.2.13)
|
pygments.rb (0.5.4)
|
||||||
rubypython (~> 0.5.3)
|
posix-spawn (~> 0.3.6)
|
||||||
rack (1.4.5)
|
yajl-ruby (~> 1.1.0)
|
||||||
rack-cache (1.2)
|
rack (1.5.2)
|
||||||
rack (>= 0.4)
|
|
||||||
rack-contrib (1.1.0)
|
rack-contrib (1.1.0)
|
||||||
rack (>= 0.9.1)
|
rack (>= 0.9.1)
|
||||||
rack-protection (1.5.2)
|
rack-protection (1.5.2)
|
||||||
rack
|
rack
|
||||||
rack-ssl (1.3.3)
|
|
||||||
rack
|
|
||||||
rack-test (0.6.2)
|
rack-test (0.6.2)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rack-throttle (0.3.0)
|
rack-throttle (0.3.0)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
rails (3.2.17)
|
rails (4.0.3)
|
||||||
actionmailer (= 3.2.17)
|
actionmailer (= 4.0.3)
|
||||||
actionpack (= 3.2.17)
|
actionpack (= 4.0.3)
|
||||||
activerecord (= 3.2.17)
|
activerecord (= 4.0.3)
|
||||||
activeresource (= 3.2.17)
|
activesupport (= 4.0.3)
|
||||||
activesupport (= 3.2.17)
|
bundler (>= 1.3.0, < 2.0)
|
||||||
bundler (~> 1.0)
|
railties (= 4.0.3)
|
||||||
railties (= 3.2.17)
|
sprockets-rails (~> 2.0.0)
|
||||||
rails3-generators (1.0.0)
|
rails3-generators (1.0.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
rails3-jquery-autocomplete (1.0.12)
|
rails3-jquery-autocomplete (1.0.12)
|
||||||
rails (>= 3.0)
|
rails (>= 3.0)
|
||||||
railties (3.2.17)
|
railties (4.0.3)
|
||||||
actionpack (= 3.2.17)
|
actionpack (= 4.0.3)
|
||||||
activesupport (= 3.2.17)
|
activesupport (= 4.0.3)
|
||||||
rack-ssl (~> 1.3.2)
|
|
||||||
rake (>= 0.8.7)
|
rake (>= 0.8.7)
|
||||||
rdoc (~> 3.4)
|
thor (>= 0.18.1, < 2.0)
|
||||||
thor (>= 0.14.6, < 2.0)
|
|
||||||
rake (10.1.1)
|
rake (10.1.1)
|
||||||
rdiscount (2.1.7)
|
rdiscount (2.1.7)
|
||||||
rdoc (3.12.2)
|
redcarpet (3.1.1)
|
||||||
json (~> 1.4)
|
redis (3.0.7)
|
||||||
redcarpet (2.2.2)
|
redis-actionpack (4.0.0)
|
||||||
redis (3.0.6)
|
actionpack (~> 4)
|
||||||
redis-actionpack (3.2.4)
|
redis-rack (~> 1.5.0)
|
||||||
actionpack (~> 3.2.0)
|
redis-store (~> 1.1.0)
|
||||||
redis-rack (~> 1.4.4)
|
redis-activesupport (4.0.0)
|
||||||
redis-store (~> 1.1.4)
|
activesupport (~> 4)
|
||||||
redis-activesupport (3.2.5)
|
|
||||||
activesupport (~> 3.2.0)
|
|
||||||
redis-store (~> 1.1.0)
|
redis-store (~> 1.1.0)
|
||||||
redis-namespace (1.4.1)
|
redis-namespace (1.4.1)
|
||||||
redis (~> 3.0.4)
|
redis (~> 3.0.4)
|
||||||
redis-rack (1.4.4)
|
redis-rack (1.5.0)
|
||||||
rack (~> 1.4.0)
|
rack (~> 1.5)
|
||||||
redis-store (~> 1.1.4)
|
redis-store (~> 1.1.0)
|
||||||
redis-rails (3.2.4)
|
redis-rails (4.0.0)
|
||||||
redis-actionpack (~> 3.2.4)
|
redis-actionpack (~> 4)
|
||||||
redis-activesupport (~> 3.2.4)
|
redis-activesupport (~> 4)
|
||||||
redis-store (~> 1.1.4)
|
redis-store (~> 1.1.0)
|
||||||
redis-store (1.1.4)
|
redis-store (1.1.4)
|
||||||
redis (>= 2.2)
|
redis (>= 2.2)
|
||||||
redisk (0.2.2)
|
|
||||||
redis (>= 0.1.1)
|
|
||||||
redis-namespace (>= 0.1.0)
|
|
||||||
resque (1.25.1)
|
resque (1.25.1)
|
||||||
mono_logger (~> 1.0)
|
mono_logger (~> 1.0)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
redis-namespace (~> 1.2)
|
redis-namespace (~> 1.2)
|
||||||
sinatra (>= 0.9.2)
|
sinatra (>= 0.9.2)
|
||||||
vegas (~> 0.1.2)
|
vegas (~> 0.1.2)
|
||||||
resque-scheduler (2.5.3)
|
resque-scheduler (2.5.4)
|
||||||
redis (~> 3.0.4)
|
redis (~> 3.0.4)
|
||||||
resque (~> 1.25.1)
|
resque (~> 1.25.1)
|
||||||
rufus-scheduler (~> 2.0.24)
|
rufus-scheduler (~> 2.0.24)
|
||||||
resque-status (0.3.3)
|
resque-status (0.4.2)
|
||||||
redisk (>= 0.2.1)
|
|
||||||
resque (~> 1.19)
|
resque (~> 1.19)
|
||||||
uuid (~> 2.3)
|
|
||||||
resque_mailer (2.2.6)
|
resque_mailer (2.2.6)
|
||||||
actionmailer (>= 3.0)
|
actionmailer (>= 3.0)
|
||||||
rest-client (1.6.7)
|
rest-client (1.6.7)
|
||||||
mime-types (>= 1.16)
|
mime-types (>= 1.16)
|
||||||
rinku (1.7.3)
|
rinku (1.7.3)
|
||||||
rr (1.0.5)
|
rouge (1.3.2)
|
||||||
rspec (2.11.0)
|
rr (1.1.2)
|
||||||
rspec-core (~> 2.11.0)
|
rspec-core (2.14.7)
|
||||||
rspec-expectations (~> 2.11.0)
|
rspec-expectations (2.14.5)
|
||||||
rspec-mocks (~> 2.11.0)
|
diff-lcs (>= 1.1.3, < 2.0)
|
||||||
rspec-core (2.11.1)
|
rspec-mocks (2.14.6)
|
||||||
rspec-expectations (2.11.3)
|
rspec-rails (2.14.1)
|
||||||
diff-lcs (~> 1.1.3)
|
|
||||||
rspec-mocks (2.11.3)
|
|
||||||
rspec-rails (2.11.4)
|
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
|
activemodel (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
railties (>= 3.0)
|
railties (>= 3.0)
|
||||||
rspec (~> 2.11.0)
|
rspec-core (~> 2.14.0)
|
||||||
|
rspec-expectations (~> 2.14.0)
|
||||||
|
rspec-mocks (~> 2.14.0)
|
||||||
ruby-haml-js (0.0.5)
|
ruby-haml-js (0.0.5)
|
||||||
execjs
|
execjs
|
||||||
sprockets (>= 2.0.0)
|
sprockets (>= 2.0.0)
|
||||||
rubypython (0.5.3)
|
|
||||||
blankslate (>= 2.1.2.3)
|
|
||||||
ffi (~> 1.0.7)
|
|
||||||
rufus-scheduler (2.0.24)
|
rufus-scheduler (2.0.24)
|
||||||
tzinfo (>= 0.3.22)
|
tzinfo (>= 0.3.22)
|
||||||
russian (0.6.0)
|
russian (0.6.0)
|
||||||
|
@ -389,11 +377,11 @@ GEM
|
||||||
capistrano (~> 2.15.4)
|
capistrano (~> 2.15.4)
|
||||||
sanitize (2.0.6)
|
sanitize (2.0.6)
|
||||||
nokogiri (>= 1.4.4)
|
nokogiri (>= 1.4.4)
|
||||||
sass (3.2.13)
|
sass (3.2.14)
|
||||||
sass-rails (3.2.6)
|
sass-rails (4.0.1)
|
||||||
railties (~> 3.2.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (>= 3.1.10)
|
sass (>= 3.1.10)
|
||||||
tilt (~> 1.3)
|
sprockets-rails (~> 2.0.0)
|
||||||
scrivener (0.0.3)
|
scrivener (0.0.3)
|
||||||
shotgun (0.9)
|
shotgun (0.9)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
|
@ -411,15 +399,20 @@ GEM
|
||||||
eventmachine (~> 1.0.0)
|
eventmachine (~> 1.0.0)
|
||||||
thin (~> 1.5.0)
|
thin (~> 1.5.0)
|
||||||
soundmanager-rails (1.0.0)
|
soundmanager-rails (1.0.0)
|
||||||
sprockets (2.2.2)
|
sprockets (2.11.0)
|
||||||
hike (~> 1.2)
|
hike (~> 1.2)
|
||||||
multi_json (~> 1.0)
|
multi_json (~> 1.0)
|
||||||
rack (~> 1.0)
|
rack (~> 1.0)
|
||||||
tilt (~> 1.1, != 1.3.0)
|
tilt (~> 1.1, != 1.3.0)
|
||||||
sqlite3 (1.3.8)
|
sprockets-rails (2.0.1)
|
||||||
|
actionpack (>= 3.0)
|
||||||
|
activesupport (>= 3.0)
|
||||||
|
sprockets (~> 2.8)
|
||||||
|
sqlite3 (1.3.9)
|
||||||
|
sqlite3-ruby (1.3.3)
|
||||||
|
sqlite3 (>= 1.3.3)
|
||||||
state_machine (1.2.0)
|
state_machine (1.2.0)
|
||||||
stringex (1.4.0)
|
stringex (2.1.2)
|
||||||
systemu (2.5.2)
|
|
||||||
therubyracer (0.10.2)
|
therubyracer (0.10.2)
|
||||||
libv8 (~> 3.3.10)
|
libv8 (~> 3.3.10)
|
||||||
thin (1.5.1)
|
thin (1.5.1)
|
||||||
|
@ -427,6 +420,8 @@ GEM
|
||||||
eventmachine (>= 0.12.6)
|
eventmachine (>= 0.12.6)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
thor (0.18.1)
|
thor (0.18.1)
|
||||||
|
thread_safe (0.2.0)
|
||||||
|
atomic (>= 1.1.7, < 2)
|
||||||
tilt (1.4.1)
|
tilt (1.4.1)
|
||||||
time_diff (0.3.0)
|
time_diff (0.3.0)
|
||||||
activesupport
|
activesupport
|
||||||
|
@ -434,17 +429,12 @@ GEM
|
||||||
treetop (1.4.15)
|
treetop (1.4.15)
|
||||||
polyglot
|
polyglot
|
||||||
polyglot (>= 0.3.1)
|
polyglot (>= 0.3.1)
|
||||||
turbo-sprockets-rails3 (0.3.11)
|
|
||||||
railties (> 3.2.8, < 4.0.0)
|
|
||||||
sprockets (>= 2.2.0)
|
|
||||||
tzinfo (0.3.38)
|
tzinfo (0.3.38)
|
||||||
uglifier (1.2.7)
|
uglifier (2.4.0)
|
||||||
execjs (>= 0.3.0)
|
execjs (>= 0.3.0)
|
||||||
multi_json (~> 1.3)
|
json (>= 1.8.0)
|
||||||
underscore-rails (1.5.2)
|
underscore-rails (1.5.2)
|
||||||
useragent (0.4.16)
|
useragent (0.8.3)
|
||||||
uuid (2.3.7)
|
|
||||||
macaddr (~> 1.0)
|
|
||||||
vegas (0.1.11)
|
vegas (0.1.11)
|
||||||
rack (>= 1.0.0)
|
rack (>= 1.0.0)
|
||||||
warden (1.2.3)
|
warden (1.2.3)
|
||||||
|
@ -458,95 +448,93 @@ GEM
|
||||||
rinku
|
rinku
|
||||||
will_paginate (3.0.5)
|
will_paginate (3.0.5)
|
||||||
ya2yaml (0.31)
|
ya2yaml (0.31)
|
||||||
|
yajl-ruby (1.1.0)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
RedCloth
|
RedCloth
|
||||||
activerecord-postgres-hstore
|
|
||||||
airbrake (~> 3.1.2)
|
airbrake (~> 3.1.2)
|
||||||
ancestry (~> 1.3.0)
|
ancestry (~> 2.0.0)
|
||||||
angular-i18n (= 0.1.2)
|
angular-i18n (= 0.1.2)
|
||||||
angularjs-rails
|
angularjs-rails
|
||||||
attr_encrypted (= 1.2.1)
|
attr_encrypted (~> 1.3.2)
|
||||||
better_errors
|
better_errors
|
||||||
binding_of_caller
|
binding_of_caller
|
||||||
bluepill (~> 0.0.60)
|
bluepill (~> 0.0.60)
|
||||||
cancan (= 1.6.7)
|
cancan (= 1.6.10)
|
||||||
cape
|
cape
|
||||||
capistrano
|
capistrano
|
||||||
capistrano_colors
|
capistrano_colors
|
||||||
charlock_holmes (~> 0.6.9)
|
charlock_holmes (~> 0.6.9)
|
||||||
coffee-rails (~> 3.2.2)
|
coffee-rails (~> 4.0.1)
|
||||||
compass-rails (~> 1.0.3)
|
compass-rails (~> 1.1.3)
|
||||||
creole
|
creole
|
||||||
devise (~> 2.2.3)
|
devise (~> 3.2.3)
|
||||||
diff-display (~> 0.0.1)
|
diff-display (~> 0.0.1)
|
||||||
factory_girl_rails (~> 4.0.0)
|
factory_girl_rails (~> 4.4.1)
|
||||||
ffi
|
ffi (~> 1.9.3)
|
||||||
friendly_id
|
friendly_id (~> 5.0.3)
|
||||||
gemoji (~> 1.2.1)
|
gemoji (~> 1.2.1)
|
||||||
github-linguist (~> 2.3.4)
|
github-linguist (~> 2.10)
|
||||||
gollum (~> 2.1.3)
|
gollum (~> 2.7.0)
|
||||||
grack!
|
grack!
|
||||||
grit!
|
grit!
|
||||||
haml-rails (~> 0.3.4)
|
haml-rails (~> 0.5)
|
||||||
highline (~> 1.6.11)
|
highline (~> 1.6.20)
|
||||||
hirb
|
hirb
|
||||||
jbuilder (~> 1.4.2)
|
jbuilder (~> 2.0.3)
|
||||||
jquery-rails (~> 2.0.2)
|
jquery-rails (~> 3.1)
|
||||||
js-routes
|
js-routes
|
||||||
localeapp
|
localeapp
|
||||||
logglier
|
logglier
|
||||||
mailcatcher
|
mailcatcher
|
||||||
meta-tags (~> 1.2.5)
|
meta-tags (~> 1.5)
|
||||||
meta_request
|
meta_request
|
||||||
mock_redis (= 0.6.2)
|
mock_redis (~> 0.11)
|
||||||
momentjs-rails
|
momentjs-rails
|
||||||
newrelic_rpm
|
newrelic_rpm
|
||||||
ng-rails-csrf
|
ng-rails-csrf
|
||||||
ohm
|
ohm (~> 1.3.2)
|
||||||
ohm-expire
|
ohm-expire (~> 0.1.3)
|
||||||
omniauth
|
omniauth
|
||||||
omniauth-facebook
|
omniauth-facebook
|
||||||
omniauth-github
|
omniauth-github
|
||||||
omniauth-google-oauth2
|
omniauth-google-oauth2
|
||||||
paperclip (~> 4.1.0)
|
paperclip (~> 4.1.1)
|
||||||
perform_later!
|
perform_later!
|
||||||
pg (~> 0.14.0)
|
pg (~> 0.17.1)
|
||||||
puma
|
puma
|
||||||
rack-throttle
|
rack-throttle (~> 0.3.0)
|
||||||
rails (= 3.2.17)
|
rails (= 4.0.3)
|
||||||
rails3-generators
|
rails3-generators
|
||||||
rails3-jquery-autocomplete (~> 1.0.7)
|
rails3-jquery-autocomplete (~> 1.0)
|
||||||
rake
|
rake
|
||||||
rdiscount
|
rdiscount
|
||||||
redcarpet (~> 2.2.2)
|
redcarpet (~> 3.1.1)
|
||||||
redhillonrails_core!
|
redhillonrails_core!
|
||||||
redis-rails
|
redis-rails (~> 4.0)
|
||||||
resque (~> 1.24)
|
resque (~> 1.25)
|
||||||
resque-scheduler
|
resque-scheduler (~> 2.5.4)
|
||||||
resque-status (~> 0.3.3)
|
resque-status (~> 0.4.2)
|
||||||
resque_mailer (~> 2.2)
|
resque_mailer (~> 2.2)
|
||||||
rest-client (~> 1.6.6)
|
rest-client (~> 1.6.7)
|
||||||
rr (~> 1.0.4)
|
rr (~> 1.1.2)
|
||||||
rspec-rails (~> 2.11.0)
|
rspec-rails (~> 2.14.1)
|
||||||
ruby-haml-js (~> 0.0.3)
|
ruby-haml-js (~> 0.0.5)
|
||||||
russian (~> 0.6.0)
|
russian (~> 0.6.0)
|
||||||
rvm-capistrano
|
rvm-capistrano
|
||||||
sass-rails (~> 3.2.5)
|
sass-rails (~> 4.0.1)
|
||||||
shotgun
|
shotgun
|
||||||
shoulda
|
shoulda
|
||||||
soundmanager-rails
|
soundmanager-rails
|
||||||
state_machine
|
state_machine (~> 1.2)
|
||||||
therubyracer (~> 0.10.2)
|
therubyracer (~> 0.10.2)
|
||||||
therubyrhino (~> 1.73.1)
|
therubyrhino (~> 1.73.1)
|
||||||
time_diff
|
time_diff
|
||||||
trinidad (~> 1.0.2)
|
uglifier (~> 2.4)
|
||||||
turbo-sprockets-rails3
|
|
||||||
uglifier (~> 1.2.4)
|
|
||||||
underscore-rails
|
underscore-rails
|
||||||
whenever (~> 0.9.0)
|
whenever (~> 0.9.0)
|
||||||
wikicloth
|
wikicloth
|
||||||
will_paginate (~> 3.0.3)
|
will_paginate (~> 3.0.5)
|
||||||
|
|
Loading…
Reference in New Issue