update gems
This commit is contained in:
Alexander Machehin
parent
7c75cc7571
commit
d8f61aa423
50
Gemfile
50
Gemfile
|
|
@ -4,11 +4,11 @@ gem 'rails', '4.0.9'
|
|||
|
||||
gem 'activeadmin', github: 'gregbell/active_admin'
|
||||
gem 'pg', '~> 0.17.1'
|
||||
gem 'schema_plus', '~> 1.4.0'
|
||||
gem 'schema_plus', '~> 1.5'
|
||||
########
|
||||
gem 'protected_attributes'
|
||||
########
|
||||
gem 'devise', '~> 3.2.3'
|
||||
gem 'devise', '~> 3.3'
|
||||
gem 'omniauth'
|
||||
gem 'omniauth-facebook'
|
||||
gem 'omniauth-google-oauth2'
|
||||
|
|
@ -17,10 +17,10 @@ gem 'omniauth-github'
|
|||
# gem 'cancan', '1.6.10'
|
||||
gem 'cancan', git: 'git://github.com/rosa-abf/cancan.git', tag: '1.6.10-abf'
|
||||
|
||||
gem 'ancestry', '~> 2.0.0'
|
||||
gem 'paperclip', '~> 4.1.1'
|
||||
gem 'ancestry', '~> 2.1'
|
||||
gem 'paperclip', '~> 4.2'
|
||||
gem 'resque', '~> 1.25'
|
||||
gem 'resque-status', '~> 0.4.2'
|
||||
gem 'resque-status', '~> 0.4'
|
||||
gem 'resque_mailer', '~> 2.2'
|
||||
gem 'resque-scheduler', '~> 2.5.4'
|
||||
gem 'perform_later', git: 'git://github.com/KensoDev/perform_later.git' # should be after resque_mailer
|
||||
|
|
@ -31,13 +31,13 @@ gem 'redis-rails', '~> 4.0'
|
|||
|
||||
gem 'grack', git: 'git://github.com/rosa-abf/grack.git', require: 'git_http'
|
||||
gem 'grit', git: 'git://github.com/rosa-abf/grit.git'
|
||||
gem 'charlock_holmes', '~> 0.6.9'
|
||||
gem 'github-linguist', '~> 2.10', require: 'linguist'
|
||||
gem 'charlock_holmes', '~> 0.7'
|
||||
gem 'github-linguist', '~> 3.1', require: 'linguist'
|
||||
gem 'diff-display', '~> 0.0.1'
|
||||
|
||||
# Wiki
|
||||
gem "gollum-lib", '~> 2.0'
|
||||
gem "redcarpet", '~> 3.1.1'
|
||||
gem "gollum-lib", '~> 3.0'
|
||||
gem "redcarpet", '~> 3.1'
|
||||
gem 'creole'
|
||||
gem 'rdiscount'
|
||||
# gem 'org-ruby'
|
||||
|
|
@ -47,25 +47,25 @@ gem 'wikicloth'
|
|||
gem 'newrelic_rpm'
|
||||
gem 'whenever', '~> 0.9.0', require: false
|
||||
|
||||
gem 'jbuilder', '~> 2.0.3'
|
||||
gem 'jbuilder', '~> 2.1'
|
||||
gem 'rails3-jquery-autocomplete', '~> 1.0'
|
||||
gem 'will_paginate', '~> 3.0.5'
|
||||
gem 'meta-tags', '~> 1.5', require: 'meta_tags'
|
||||
gem 'will_paginate', '~> 3.0'
|
||||
gem 'meta-tags', '~> 2.0', require: 'meta_tags'
|
||||
gem "haml-rails", '~> 0.5'
|
||||
gem 'jquery-rails', '~> 2.3.0'
|
||||
gem 'jquery-rails', '~> 3.1'
|
||||
gem 'jquery-migrate-rails'
|
||||
gem 'ruby-haml-js', '~> 0.0.5'
|
||||
gem 'friendly_id', '~> 5.0.3'
|
||||
gem 'friendly_id', '~> 5.0'
|
||||
|
||||
gem 'rack-throttle', '~> 0.3.0'
|
||||
gem 'rest-client', '~> 1.6.7'
|
||||
gem 'ohm', '~> 1.3.2'
|
||||
gem 'rest-client', '~> 1.7'
|
||||
gem 'ohm', '~> 2.0'
|
||||
gem 'ohm-expire', '~> 0.1.3'
|
||||
|
||||
gem 'ffi', '~> 1.9.3'
|
||||
|
||||
gem 'attr_encrypted', '~> 1.3.2'
|
||||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
|
||||
gem 'attr_encrypted', '~> 1.3'
|
||||
gem "gemoji", "~> 2.1", require: 'emoji/railtie'
|
||||
|
||||
# AngularJS related stuff
|
||||
gem 'underscore-rails'
|
||||
|
|
@ -78,19 +78,19 @@ gem 'soundmanager-rails'
|
|||
|
||||
gem 'time_diff'
|
||||
|
||||
gem 'sass-rails', '~> 4.0.1'
|
||||
gem 'sass-rails', '~> 4.0'
|
||||
gem 'coffee-rails', '~> 4.0.1'
|
||||
gem 'compass-rails', '~> 1.1.6'
|
||||
gem 'uglifier', '~> 2.4'
|
||||
gem 'compass-rails', '~> 2.0'
|
||||
gem 'uglifier', '~> 2.5'
|
||||
gem 'therubyracer', '~> 0.12.1', platforms: [:mri, :rbx]
|
||||
gem 'therubyrhino', '~> 1.73.1', platforms: :jruby
|
||||
gem 'therubyrhino', '~> 2.0', platforms: :jruby
|
||||
gem 'sitemap_generator'
|
||||
|
||||
gem 'codemirror-rails', '~> 4.0'
|
||||
gem 'codemirror-rails', '~> 4.5'
|
||||
|
||||
group :production do
|
||||
gem "airbrake", '~> 3.1.2'
|
||||
gem 'bluepill', '~> 0.0.60', require: false
|
||||
gem "airbrake", '~> 3.1'
|
||||
#gem 'bluepill', '~> 0.0.60', require: false
|
||||
# gem 'le'
|
||||
gem 'logglier'
|
||||
gem 'puma'
|
||||
|
|
|
|||
315
Gemfile.lock
315
Gemfile.lock
|
|
@ -10,19 +10,18 @@ GIT
|
|||
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 5ac883c59978799829a8c085fab47f858574c42f
|
||||
revision: 5e9917a5c85d0697114ce9f6166da48595c4d1ba
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
devise (~> 3.2)
|
||||
formtastic (~> 2.3.0.rc2)
|
||||
inherited_resources (~> 1.3)
|
||||
formtastic (~> 2.3.0.rc3)
|
||||
inherited_resources (~> 1.4.1)
|
||||
jquery-rails
|
||||
jquery-ui-rails
|
||||
jquery-ui-rails (~> 5.0)
|
||||
kaminari (~> 0.15)
|
||||
rails (>= 3.2, <= 4.1)
|
||||
rails (>= 3.2, < 4.2)
|
||||
ransack (~> 1.0)
|
||||
sass-rails
|
||||
|
||||
|
|
@ -77,33 +76,27 @@ GEM
|
|||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
addressable (2.3.6)
|
||||
airbrake (3.1.16)
|
||||
airbrake (3.2.1)
|
||||
builder
|
||||
multi_json
|
||||
ancestry (2.0.0)
|
||||
ancestry (2.1.0)
|
||||
activerecord (>= 3.0.0)
|
||||
angular-i18n (0.1.2)
|
||||
angularjs-rails (1.2.18)
|
||||
arbre (1.0.1)
|
||||
angularjs-rails (1.2.22)
|
||||
arbre (1.0.2)
|
||||
activesupport (>= 3.0.0)
|
||||
arel (4.0.2)
|
||||
attr_encrypted (1.3.2)
|
||||
attr_encrypted (1.3.3)
|
||||
encryptor (>= 1.3.0)
|
||||
bcrypt (3.1.7)
|
||||
bcrypt-ruby (3.1.5)
|
||||
bcrypt (>= 3.1.3)
|
||||
better_errors (1.1.0)
|
||||
better_errors (2.0.0)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
rack (>= 0.9.0)
|
||||
binding_of_caller (0.7.2)
|
||||
debug_inspector (>= 0.0.1)
|
||||
bluepill (0.0.64)
|
||||
activesupport (>= 3.0.0)
|
||||
daemons (~> 1.1.4)
|
||||
i18n (>= 0.5.0)
|
||||
state_machine (~> 1.1)
|
||||
bourbon (3.1.8)
|
||||
sass (>= 3.2.0)
|
||||
bourbon (3.2.3)
|
||||
sass (~> 3.2)
|
||||
thor
|
||||
builder (3.1.4)
|
||||
callsite (0.0.11)
|
||||
|
|
@ -115,36 +108,36 @@ GEM
|
|||
net-ssh (>= 2.0.14)
|
||||
net-ssh-gateway (>= 1.1.0)
|
||||
capistrano_colors (0.5.5)
|
||||
charlock_holmes (0.6.9.4)
|
||||
charlock_holmes (0.7.3)
|
||||
chronic (0.10.2)
|
||||
chunky_png (1.3.0)
|
||||
chunky_png (1.3.1)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
cocaine (0.5.3)
|
||||
cocaine (0.5.4)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
codemirror-rails (4.0)
|
||||
codemirror-rails (4.5)
|
||||
railties (>= 3.0, < 5)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.0.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script (2.3.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.7.0)
|
||||
compass (0.12.3)
|
||||
coffee-script-source (1.8.0)
|
||||
compass (0.12.7)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (= 3.2.14)
|
||||
compass-rails (1.1.6)
|
||||
sass (~> 3.2.19)
|
||||
compass-rails (2.0.0)
|
||||
compass (>= 0.12.2)
|
||||
crack (0.4.2)
|
||||
safe_yaml (~> 1.0.0)
|
||||
creole (0.5.0)
|
||||
daemons (1.1.9)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.2.3)
|
||||
bcrypt-ruby (~> 3.0)
|
||||
devise (3.3.0)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
thread_safe (~> 0.1)
|
||||
|
|
@ -155,7 +148,7 @@ GEM
|
|||
erubis (2.7.0)
|
||||
escape_utils (1.0.1)
|
||||
eventmachine (1.0.3)
|
||||
execjs (2.0.2)
|
||||
execjs (2.2.1)
|
||||
expression_parser (0.9.0)
|
||||
factory_girl (4.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
|
@ -165,31 +158,33 @@ GEM
|
|||
faraday (0.9.0)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.9.3)
|
||||
formtastic (2.3.0.rc2)
|
||||
formtastic (2.3.0)
|
||||
actionpack (>= 3.0)
|
||||
friendly_id (5.0.3)
|
||||
friendly_id (5.0.4)
|
||||
activerecord (>= 4.0.0)
|
||||
fssm (0.2.10)
|
||||
gemoji (1.2.1)
|
||||
github-linguist (2.10.11)
|
||||
charlock_holmes (~> 0.6.6)
|
||||
escape_utils (>= 0.3.1)
|
||||
gemoji (2.1.0)
|
||||
github-linguist (3.1.2)
|
||||
charlock_holmes (~> 0.7.3)
|
||||
escape_utils (~> 1.0.1)
|
||||
mime-types (~> 1.19)
|
||||
pygments.rb (~> 0.5.4)
|
||||
github-markup (0.7.5)
|
||||
gitlab-grit (2.6.0)
|
||||
charlock_holmes (~> 0.6.9)
|
||||
pygments.rb (~> 0.6.0)
|
||||
rugged (~> 0.21.0)
|
||||
github-markup (1.1.2)
|
||||
posix-spawn (~> 0.3.8)
|
||||
gitlab-grit (2.6.10)
|
||||
charlock_holmes (~> 0.6)
|
||||
diff-lcs (~> 1.1)
|
||||
mime-types (~> 1.15)
|
||||
posix-spawn (~> 0.3.6)
|
||||
gli (2.9.0)
|
||||
gollum-lib (2.0.0)
|
||||
github-markup (>= 0.7.5, < 1.0.0)
|
||||
gitlab-grit (= 2.6.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
rouge (~> 1.3.1)
|
||||
sanitize (~> 2.0.6)
|
||||
stringex (~> 2.1.0)
|
||||
posix-spawn (~> 0.3)
|
||||
gli (2.12.0)
|
||||
gollum-lib (3.0.0)
|
||||
github-markup (~> 1.1.0)
|
||||
gitlab-grit (~> 2.6.5)
|
||||
nokogiri (~> 1.6.1)
|
||||
rouge (~> 1.3.3)
|
||||
sanitize (~> 2.1.0)
|
||||
stringex (~> 2.5.1)
|
||||
haml (4.0.5)
|
||||
tilt
|
||||
haml-rails (0.5.3)
|
||||
|
|
@ -200,34 +195,34 @@ GEM
|
|||
has_scope (0.6.0.rc)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
hashie (2.0.5)
|
||||
hashie (3.3.1)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
hirb (0.7.1)
|
||||
hirb (0.7.2)
|
||||
hiredis (0.5.2)
|
||||
i18n (0.6.11)
|
||||
inherited_resources (1.4.1)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
responders (~> 1.0.0.rc)
|
||||
jbuilder (2.0.4)
|
||||
activesupport (>= 3.0.0)
|
||||
multi_json (>= 1.2.0)
|
||||
jbuilder (2.1.3)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-migrate-rails (1.2.1)
|
||||
jquery-rails (2.3.0)
|
||||
jquery-rails (3.1.1)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (4.2.0)
|
||||
jquery-ui-rails (5.0.0)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (0.9.7)
|
||||
js-routes (0.9.9)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
json (1.8.1)
|
||||
jwt (0.1.11)
|
||||
multi_json (>= 1.5)
|
||||
kaminari (0.15.1)
|
||||
jwt (1.0.0)
|
||||
kaminari (0.16.1)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
libv8 (3.16.14.3)
|
||||
localeapp (0.7.1)
|
||||
localeapp (0.8.1)
|
||||
gli
|
||||
i18n
|
||||
json
|
||||
|
|
@ -248,85 +243,86 @@ GEM
|
|||
skinny (>= 0.1.2)
|
||||
sqlite3-ruby
|
||||
thin
|
||||
meta-tags (1.5.0)
|
||||
actionpack
|
||||
meta_request (0.2.8)
|
||||
callsite
|
||||
rack-contrib
|
||||
railties
|
||||
meta-tags (2.0.0)
|
||||
actionpack (>= 3.0.0)
|
||||
meta_request (0.3.4)
|
||||
callsite (~> 0.0, >= 0.0.11)
|
||||
rack-contrib (~> 1.1)
|
||||
railties (>= 3.0.0, < 5.0.0)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.5.2)
|
||||
mini_portile (0.6.0)
|
||||
minitest (4.7.5)
|
||||
mock_redis (0.11.0)
|
||||
momentjs-rails (2.5.1)
|
||||
mock_redis (0.13.2)
|
||||
momentjs-rails (2.8.1)
|
||||
railties (>= 3.1)
|
||||
mono_logger (1.1.0)
|
||||
msgpack (0.5.8)
|
||||
multi_json (1.10.1)
|
||||
multi_xml (0.5.5)
|
||||
multipart-post (2.0.0)
|
||||
nest (1.1.2)
|
||||
redis
|
||||
net-scp (1.1.2)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.8.0)
|
||||
net-ssh (2.9.1)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
newrelic_rpm (3.7.3.204)
|
||||
netrc (0.7.7)
|
||||
newrelic_rpm (3.9.3.241)
|
||||
ng-rails-csrf (0.1.0)
|
||||
nokogiri (1.6.1)
|
||||
mini_portile (~> 0.5.0)
|
||||
oauth2 (0.9.3)
|
||||
nido (0.0.1)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
oauth2 (1.0.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
jwt (~> 0.1.8)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (~> 1.2)
|
||||
ohm (1.3.2)
|
||||
nest (~> 1.0)
|
||||
redis
|
||||
scrivener (~> 0.0.3)
|
||||
ohm (2.0.1)
|
||||
msgpack
|
||||
nido
|
||||
redic
|
||||
ohm-expire (0.1.3.2)
|
||||
ohm (>= 0.1.5)
|
||||
omniauth (1.2.1)
|
||||
hashie (>= 1.2, < 3)
|
||||
omniauth (1.2.2)
|
||||
hashie (>= 1.2, < 4)
|
||||
rack (~> 1.0)
|
||||
omniauth-facebook (1.6.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-github (1.1.1)
|
||||
omniauth-facebook (2.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-github (1.1.2)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-google-oauth2 (0.2.2)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2
|
||||
omniauth-oauth2 (1.1.2)
|
||||
omniauth-google-oauth2 (0.2.5)
|
||||
omniauth (> 1.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-oauth2 (1.2.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
multi_json (~> 1.3)
|
||||
oauth2 (~> 0.9.3)
|
||||
oauth2 (~> 1.0)
|
||||
omniauth (~> 1.2)
|
||||
orm_adapter (0.5.0)
|
||||
paperclip (4.1.1)
|
||||
paperclip (4.2.0)
|
||||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
cocaine (~> 0.5.3)
|
||||
mime-types
|
||||
pg (0.17.1)
|
||||
polyamorous (0.6.4)
|
||||
polyamorous (1.1.0)
|
||||
activerecord (>= 3.0)
|
||||
polyglot (0.3.5)
|
||||
posix-spawn (0.3.8)
|
||||
protected_attributes (1.0.7)
|
||||
posix-spawn (0.3.9)
|
||||
protected_attributes (1.0.8)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
puma (2.8.2)
|
||||
puma (2.9.0)
|
||||
rack (>= 1.1, < 2.0)
|
||||
pygments.rb (0.5.4)
|
||||
pygments.rb (0.6.0)
|
||||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
rack (1.5.2)
|
||||
rack-contrib (1.1.0)
|
||||
rack (>= 0.9.1)
|
||||
rack-protection (1.5.2)
|
||||
rack-protection (1.5.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
|
|
@ -342,7 +338,7 @@ GEM
|
|||
sprockets-rails (~> 2.0)
|
||||
rails3-generators (1.0.0)
|
||||
railties (>= 3.0.0)
|
||||
rails3-jquery-autocomplete (1.0.12)
|
||||
rails3-jquery-autocomplete (1.0.14)
|
||||
rails (>= 3.0)
|
||||
railties (4.0.9)
|
||||
actionpack (= 4.0.9)
|
||||
|
|
@ -350,14 +346,16 @@ GEM
|
|||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
ransack (1.2.1)
|
||||
ransack (1.3.0)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
i18n
|
||||
polyamorous (~> 0.6.0)
|
||||
rdiscount (2.1.7)
|
||||
redcarpet (3.1.1)
|
||||
polyamorous (~> 1.1)
|
||||
rdiscount (2.1.7.1)
|
||||
redcarpet (3.1.2)
|
||||
redic (1.1.1)
|
||||
hiredis
|
||||
redis (3.0.7)
|
||||
redis-actionpack (4.0.0)
|
||||
actionpack (~> 4)
|
||||
|
|
@ -366,8 +364,8 @@ GEM
|
|||
redis-activesupport (4.0.0)
|
||||
activesupport (~> 4)
|
||||
redis-store (~> 1.1.0)
|
||||
redis-namespace (1.4.1)
|
||||
redis (~> 3.0.4)
|
||||
redis-namespace (1.5.1)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
redis-rack (1.5.0)
|
||||
rack (~> 1.5)
|
||||
redis-store (~> 1.1.0)
|
||||
|
|
@ -391,20 +389,21 @@ GEM
|
|||
redis (~> 3.0.4)
|
||||
resque (~> 1.25.1)
|
||||
rufus-scheduler (~> 2.0.24)
|
||||
resque-status (0.4.2)
|
||||
resque-status (0.4.3)
|
||||
resque (~> 1.19)
|
||||
resque_mailer (2.2.6)
|
||||
actionmailer (>= 3.0)
|
||||
rest-client (1.6.7)
|
||||
mime-types (>= 1.16)
|
||||
rest-client (1.7.2)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
rinku (1.7.3)
|
||||
rouge (1.3.3)
|
||||
rouge (1.3.4)
|
||||
rr (1.1.2)
|
||||
rspec-core (2.14.8)
|
||||
rspec-expectations (2.14.5)
|
||||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.14.6)
|
||||
rspec-rails (2.14.1)
|
||||
rspec-rails (2.14.2)
|
||||
actionpack (>= 3.0)
|
||||
activemodel (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
|
|
@ -417,43 +416,43 @@ GEM
|
|||
sprockets (>= 2.0.0)
|
||||
rufus-scheduler (2.0.24)
|
||||
tzinfo (>= 0.3.22)
|
||||
rugged (0.21.0)
|
||||
russian (0.6.0)
|
||||
i18n (>= 0.5.0)
|
||||
rvm-capistrano (1.5.1)
|
||||
rvm-capistrano (1.5.3)
|
||||
capistrano (~> 2.15.4)
|
||||
safe_yaml (1.0.3)
|
||||
sanitize (2.0.6)
|
||||
sanitize (2.1.0)
|
||||
nokogiri (>= 1.4.4)
|
||||
sass (3.2.14)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.2)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2.0)
|
||||
sprockets (~> 2.8, <= 2.11.0)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
schema_plus (1.4.1)
|
||||
rails (>= 3.2)
|
||||
schema_plus (1.5.3)
|
||||
activerecord (>= 3.2)
|
||||
valuable
|
||||
scrivener (0.0.3)
|
||||
shotgun (0.9)
|
||||
rack (>= 1.0)
|
||||
shoulda (3.5.0)
|
||||
shoulda-context (~> 1.0, >= 1.0.1)
|
||||
shoulda-matchers (>= 1.4.1, < 3.0)
|
||||
shoulda-context (1.1.6)
|
||||
shoulda-matchers (2.5.0)
|
||||
shoulda-context (1.2.1)
|
||||
shoulda-matchers (2.6.2)
|
||||
activesupport (>= 3.0.0)
|
||||
sinatra (1.4.4)
|
||||
sinatra (1.4.5)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (~> 1.3, >= 1.3.4)
|
||||
sitemap_generator (5.0.1)
|
||||
sitemap_generator (5.0.5)
|
||||
builder
|
||||
skinny (0.2.3)
|
||||
eventmachine (~> 1.0.0)
|
||||
thin (~> 1.5.0)
|
||||
skype (0.2.7)
|
||||
skype (0.2.8)
|
||||
tmp_cache
|
||||
soundmanager-rails (1.0.0)
|
||||
soundmanager-rails (1.0.1)
|
||||
sprockets (2.11.0)
|
||||
hike (~> 1.2)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -467,8 +466,9 @@ GEM
|
|||
sqlite3-ruby (1.3.3)
|
||||
sqlite3 (>= 1.3.3)
|
||||
state_machine (1.2.0)
|
||||
stringex (2.1.2)
|
||||
test_after_commit (0.2.3)
|
||||
stringex (2.5.2)
|
||||
test_after_commit (0.2.5)
|
||||
activerecord (>= 3.2)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
ref
|
||||
|
|
@ -488,10 +488,10 @@ GEM
|
|||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.41)
|
||||
uglifier (2.4.0)
|
||||
uglifier (2.5.3)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
underscore-rails (1.6.0)
|
||||
underscore-rails (1.7.0)
|
||||
valuable (0.9.8)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
|
|
@ -507,7 +507,7 @@ GEM
|
|||
builder
|
||||
expression_parser
|
||||
rinku
|
||||
will_paginate (3.0.5)
|
||||
will_paginate (3.0.7)
|
||||
ya2yaml (0.31)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
|
|
@ -517,56 +517,55 @@ PLATFORMS
|
|||
DEPENDENCIES
|
||||
RedCloth
|
||||
activeadmin!
|
||||
airbrake (~> 3.1.2)
|
||||
ancestry (~> 2.0.0)
|
||||
airbrake (~> 3.1)
|
||||
ancestry (~> 2.1)
|
||||
angular-i18n (= 0.1.2)
|
||||
angularjs-rails
|
||||
attr_encrypted (~> 1.3.2)
|
||||
attr_encrypted (~> 1.3)
|
||||
better_errors
|
||||
binding_of_caller
|
||||
bluepill (~> 0.0.60)
|
||||
cancan!
|
||||
cape
|
||||
capistrano
|
||||
capistrano_colors
|
||||
charlock_holmes (~> 0.6.9)
|
||||
codemirror-rails (~> 4.0)
|
||||
charlock_holmes (~> 0.7)
|
||||
codemirror-rails (~> 4.5)
|
||||
coffee-rails (~> 4.0.1)
|
||||
compass-rails (~> 1.1.6)
|
||||
compass-rails (~> 2.0)
|
||||
creole
|
||||
devise (~> 3.2.3)
|
||||
devise (~> 3.3)
|
||||
diff-display (~> 0.0.1)
|
||||
factory_girl_rails (~> 4.4.1)
|
||||
ffi (~> 1.9.3)
|
||||
friendly_id (~> 5.0.3)
|
||||
gemoji (~> 1.2.1)
|
||||
github-linguist (~> 2.10)
|
||||
gollum-lib (~> 2.0)
|
||||
friendly_id (~> 5.0)
|
||||
gemoji (~> 2.1)
|
||||
github-linguist (~> 3.1)
|
||||
gollum-lib (~> 3.0)
|
||||
grack!
|
||||
grit!
|
||||
haml-rails (~> 0.5)
|
||||
highline (~> 1.6.20)
|
||||
hirb
|
||||
jbuilder (~> 2.0.3)
|
||||
jbuilder (~> 2.1)
|
||||
jquery-migrate-rails
|
||||
jquery-rails (~> 2.3.0)
|
||||
jquery-rails (~> 3.1)
|
||||
js-routes
|
||||
localeapp
|
||||
logglier
|
||||
mailcatcher
|
||||
meta-tags (~> 1.5)
|
||||
meta-tags (~> 2.0)
|
||||
meta_request
|
||||
mock_redis (~> 0.11)
|
||||
momentjs-rails
|
||||
newrelic_rpm
|
||||
ng-rails-csrf
|
||||
ohm (~> 1.3.2)
|
||||
ohm (~> 2.0)
|
||||
ohm-expire (~> 0.1.3)
|
||||
omniauth
|
||||
omniauth-facebook
|
||||
omniauth-github
|
||||
omniauth-google-oauth2
|
||||
paperclip (~> 4.1.1)
|
||||
paperclip (~> 4.2)
|
||||
perform_later!
|
||||
pg (~> 0.17.1)
|
||||
protected_attributes
|
||||
|
|
@ -577,20 +576,20 @@ DEPENDENCIES
|
|||
rails3-jquery-autocomplete (~> 1.0)
|
||||
rake
|
||||
rdiscount
|
||||
redcarpet (~> 3.1.1)
|
||||
redcarpet (~> 3.1)
|
||||
redis-rails (~> 4.0)
|
||||
resque (~> 1.25)
|
||||
resque-scheduler (~> 2.5.4)
|
||||
resque-status (~> 0.4.2)
|
||||
resque-status (~> 0.4)
|
||||
resque_mailer (~> 2.2)
|
||||
rest-client (~> 1.6.7)
|
||||
rest-client (~> 1.7)
|
||||
rr (~> 1.1.2)
|
||||
rspec-rails (~> 2.14.1)
|
||||
ruby-haml-js (~> 0.0.5)
|
||||
russian (~> 0.6.0)
|
||||
rvm-capistrano
|
||||
sass-rails (~> 4.0.1)
|
||||
schema_plus (~> 1.4.0)
|
||||
sass-rails (~> 4.0)
|
||||
schema_plus (~> 1.5)
|
||||
shotgun
|
||||
shoulda
|
||||
shoulda-matchers
|
||||
|
|
@ -600,12 +599,12 @@ DEPENDENCIES
|
|||
state_machine (~> 1.2)
|
||||
test_after_commit
|
||||
therubyracer (~> 0.12.1)
|
||||
therubyrhino (~> 1.73.1)
|
||||
therubyrhino (~> 2.0)
|
||||
time_diff
|
||||
timecop
|
||||
uglifier (~> 2.4)
|
||||
uglifier (~> 2.5)
|
||||
underscore-rails
|
||||
webmock
|
||||
whenever (~> 0.9.0)
|
||||
wikicloth
|
||||
will_paginate (~> 3.0.5)
|
||||
will_paginate (~> 3.0)
|
||||
|
|
|
|||
Loading…
Reference in New Issue