Update ruby to 2.2.0, gems
This commit is contained in:
Vokhmin Alexey V
parent
818f3bb77a
commit
7c5e5906f5
5
Gemfile
5
Gemfile
|
|
@ -2,7 +2,7 @@ source 'https://rubygems.org'
|
|||
|
||||
gem 'rails', '4.0.11'
|
||||
|
||||
gem 'activeadmin', github: 'gregbell/active_admin'
|
||||
gem 'activeadmin', github: 'activeadmin'
|
||||
gem 'pg', '~> 0.17.1'
|
||||
gem 'schema_plus', '~> 1.5'
|
||||
########
|
||||
|
|
@ -32,7 +32,7 @@ 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', tag: '2.6.16'
|
||||
gem 'charlock_holmes', '~> 0.7'
|
||||
gem 'github-linguist', '~> 3.1', require: 'linguist'
|
||||
gem 'github-linguist', '3.1.5', require: 'linguist'
|
||||
gem 'diff-display', '~> 0.0.1'
|
||||
|
||||
# Wiki
|
||||
|
|
@ -49,6 +49,7 @@ gem 'whenever', '~> 0.9.0', require: false
|
|||
|
||||
gem 'jbuilder', '~> 2.2'
|
||||
gem 'rails3-jquery-autocomplete'
|
||||
gem 'sprockets', '2.11.0'
|
||||
gem 'will_paginate', '~> 3.0'
|
||||
gem 'meta-tags', '~> 2.0', require: 'meta_tags'
|
||||
gem "haml-rails", '~> 0.5'
|
||||
|
|
|
|||
255
Gemfile.lock
255
Gemfile.lock
|
|
@ -9,20 +9,21 @@ GIT
|
|||
resque-scheduler
|
||||
|
||||
GIT
|
||||
remote: git://github.com/gregbell/active_admin.git
|
||||
revision: 5e9917a5c85d0697114ce9f6166da48595c4d1ba
|
||||
remote: git://github.com/activeadmin/activeadmin.git
|
||||
revision: 51faef09fe27cdf84568cd00b10ccb9ee8a26151
|
||||
specs:
|
||||
activeadmin (1.0.0.pre)
|
||||
arbre (~> 1.0, >= 1.0.2)
|
||||
bourbon
|
||||
coffee-rails
|
||||
formtastic (~> 2.3.0.rc3)
|
||||
inherited_resources (~> 1.4.1)
|
||||
formtastic (~> 3.1)
|
||||
formtastic_i18n
|
||||
inherited_resources (~> 1.6)
|
||||
jquery-rails
|
||||
jquery-ui-rails (~> 5.0)
|
||||
kaminari (~> 0.15)
|
||||
rails (>= 3.2, < 4.2)
|
||||
ransack (~> 1.0)
|
||||
rails (>= 3.2, < 5.0)
|
||||
ransack (~> 1.3)
|
||||
sass-rails
|
||||
|
||||
GIT
|
||||
|
|
@ -76,7 +77,7 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo (~> 0.3.37)
|
||||
addressable (2.3.6)
|
||||
addressable (2.3.7)
|
||||
airbrake (3.2.1)
|
||||
builder
|
||||
multi_json
|
||||
|
|
@ -87,18 +88,18 @@ GEM
|
|||
railties (>= 3.1)
|
||||
sprockets
|
||||
tilt
|
||||
angular-ui-bootstrap-rails (0.11.2)
|
||||
angularjs-rails (1.2.22)
|
||||
arbre (1.0.2)
|
||||
angular-ui-bootstrap-rails (0.12.0)
|
||||
angularjs-rails (1.2.26)
|
||||
arbre (1.0.3)
|
||||
activesupport (>= 3.0.0)
|
||||
arel (4.0.2)
|
||||
attr_encrypted (1.3.3)
|
||||
encryptor (>= 1.3.0)
|
||||
autoprefixer-rails (5.1.3.1)
|
||||
autoprefixer-rails (5.1.5)
|
||||
execjs
|
||||
json
|
||||
bcrypt (3.1.7)
|
||||
better_errors (2.0.0)
|
||||
bcrypt (3.1.10)
|
||||
better_errors (2.1.1)
|
||||
coderay (>= 1.0.0)
|
||||
erubis (>= 2.6.6)
|
||||
rack (>= 0.9.0)
|
||||
|
|
@ -107,8 +108,8 @@ GEM
|
|||
bootstrap-sass (3.3.3)
|
||||
autoprefixer-rails (>= 5.0.0.1)
|
||||
sass (>= 3.2.19)
|
||||
bourbon (3.2.3)
|
||||
sass (~> 3.2)
|
||||
bourbon (4.2.0)
|
||||
sass (~> 3.4)
|
||||
thor
|
||||
builder (3.1.4)
|
||||
callsite (0.0.11)
|
||||
|
|
@ -122,12 +123,12 @@ GEM
|
|||
capistrano_colors (0.5.5)
|
||||
charlock_holmes (0.7.3)
|
||||
chronic (0.10.2)
|
||||
chunky_png (1.3.1)
|
||||
chunky_png (1.3.3)
|
||||
climate_control (0.0.3)
|
||||
activesupport (>= 3.0)
|
||||
cocaine (0.5.4)
|
||||
cocaine (0.5.5)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
codemirror-rails (4.5)
|
||||
codemirror-rails (4.8)
|
||||
railties (>= 3.0, < 5)
|
||||
coderay (1.1.0)
|
||||
coffee-rails (4.1.0)
|
||||
|
|
@ -136,22 +137,33 @@ GEM
|
|||
coffee-script (2.3.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.8.0)
|
||||
compass (0.12.7)
|
||||
coffee-script-source (1.9.0)
|
||||
compass (1.0.3)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
sass (~> 3.2.19)
|
||||
compass-rails (2.0.0)
|
||||
compass (>= 0.12.2)
|
||||
compass-core (~> 1.0.2)
|
||||
compass-import-once (~> 1.0.5)
|
||||
rb-fsevent (>= 0.9.3)
|
||||
rb-inotify (>= 0.9)
|
||||
sass (>= 3.3.13, < 3.5)
|
||||
compass-core (1.0.3)
|
||||
multi_json (~> 1.0)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
compass-import-once (1.0.5)
|
||||
sass (>= 3.2, < 3.5)
|
||||
compass-rails (2.0.4)
|
||||
compass (~> 1.0.0)
|
||||
sass-rails (<= 5.0.1)
|
||||
sprockets (< 2.13)
|
||||
crack (0.4.2)
|
||||
safe_yaml (~> 1.0.0)
|
||||
creole (0.5.0)
|
||||
daemons (1.1.9)
|
||||
debug_inspector (0.0.2)
|
||||
devise (3.3.0)
|
||||
devise (3.4.1)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 3.2.6, < 5)
|
||||
responders
|
||||
thread_safe (~> 0.1)
|
||||
warden (~> 1.2.3)
|
||||
diff-display (0.0.1)
|
||||
|
|
@ -159,26 +171,26 @@ GEM
|
|||
encryptor (1.3.0)
|
||||
erubis (2.7.0)
|
||||
escape_utils (1.0.1)
|
||||
eventmachine (1.0.3)
|
||||
execjs (2.2.2)
|
||||
eventmachine (1.0.5)
|
||||
execjs (2.3.0)
|
||||
expression_parser (0.9.0)
|
||||
factory_girl (4.4.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.4.1)
|
||||
factory_girl (~> 4.4.0)
|
||||
railties (>= 3.0.0)
|
||||
faraday (0.9.0)
|
||||
faraday (0.9.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.9.3)
|
||||
font-awesome-rails (4.2.0.0)
|
||||
ffi (1.9.6)
|
||||
font-awesome-rails (4.3.0.0)
|
||||
railties (>= 3.2, < 5.0)
|
||||
formtastic (2.3.0)
|
||||
actionpack (>= 3.0)
|
||||
friendly_id (5.0.4)
|
||||
formtastic (3.1.3)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic_i18n (0.1.1)
|
||||
friendly_id (5.1.0)
|
||||
activerecord (>= 4.0.0)
|
||||
fssm (0.2.10)
|
||||
gemoji (2.1.0)
|
||||
github-linguist (3.1.2)
|
||||
github-linguist (3.1.5)
|
||||
charlock_holmes (~> 0.7.3)
|
||||
escape_utils (~> 1.0.1)
|
||||
mime-types (~> 1.19)
|
||||
|
|
@ -186,12 +198,12 @@ GEM
|
|||
rugged (~> 0.21.0)
|
||||
github-markup (1.1.2)
|
||||
posix-spawn (~> 0.3.8)
|
||||
gitlab-grit (2.6.10)
|
||||
gitlab-grit (2.6.12)
|
||||
charlock_holmes (~> 0.6)
|
||||
diff-lcs (~> 1.1)
|
||||
mime-types (~> 1.15)
|
||||
posix-spawn (~> 0.3)
|
||||
gli (2.12.0)
|
||||
gli (2.12.2)
|
||||
gollum-lib (3.0.0)
|
||||
github-markup (~> 1.1.0)
|
||||
gitlab-grit (~> 2.6.5)
|
||||
|
|
@ -199,61 +211,67 @@ GEM
|
|||
rouge (~> 1.3.3)
|
||||
sanitize (~> 2.1.0)
|
||||
stringex (~> 2.5.1)
|
||||
haml (4.0.5)
|
||||
haml (4.0.6)
|
||||
tilt
|
||||
haml-rails (0.5.3)
|
||||
haml-rails (0.8.2)
|
||||
actionpack (>= 4.0.1)
|
||||
activesupport (>= 4.0.1)
|
||||
haml (>= 3.1, < 5.0)
|
||||
html2haml (>= 1.0.1)
|
||||
railties (>= 4.0.1)
|
||||
has_scope (0.6.0.rc)
|
||||
has_scope (0.6.0)
|
||||
actionpack (>= 3.2, < 5)
|
||||
activesupport (>= 3.2, < 5)
|
||||
hashie (3.3.1)
|
||||
hashie (3.4.0)
|
||||
highline (1.6.21)
|
||||
hike (1.2.3)
|
||||
hirb (0.7.2)
|
||||
i18n (0.6.11)
|
||||
inherited_resources (1.4.1)
|
||||
hirb (0.7.3)
|
||||
html2haml (2.0.0)
|
||||
erubis (~> 2.7.0)
|
||||
haml (~> 4.0.0)
|
||||
nokogiri (~> 1.6.0)
|
||||
ruby_parser (~> 3.5)
|
||||
i18n (0.7.0)
|
||||
inherited_resources (1.6.0)
|
||||
actionpack (>= 3.2, < 5)
|
||||
has_scope (~> 0.6.0.rc)
|
||||
responders (~> 1.0.0.rc)
|
||||
jbuilder (2.2.4)
|
||||
railties (>= 3.2, < 5)
|
||||
responders
|
||||
jbuilder (2.2.6)
|
||||
activesupport (>= 3.0.0, < 5)
|
||||
multi_json (~> 1.2)
|
||||
jquery-migrate-rails (1.2.1)
|
||||
jquery-rails (2.3.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.0)
|
||||
jquery-ui-rails (5.0.3)
|
||||
railties (>= 3.2.16)
|
||||
js-routes (0.9.9)
|
||||
js-routes (1.0.0)
|
||||
railties (>= 3.2)
|
||||
sprockets-rails
|
||||
json (1.8.1)
|
||||
jwt (1.0.0)
|
||||
kaminari (0.16.1)
|
||||
json (1.8.2)
|
||||
jwt (1.2.1)
|
||||
kaminari (0.16.3)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
libv8 (3.16.14.3)
|
||||
localeapp (0.8.1)
|
||||
libv8 (3.16.14.7)
|
||||
localeapp (0.9.0)
|
||||
gli
|
||||
i18n
|
||||
json
|
||||
rack
|
||||
rest-client
|
||||
ya2yaml
|
||||
mail (2.6.1)
|
||||
mail (2.6.3)
|
||||
mime-types (>= 1.16, < 3)
|
||||
mailcatcher (0.2.4)
|
||||
eventmachine
|
||||
haml
|
||||
i18n
|
||||
json
|
||||
mail
|
||||
sinatra
|
||||
skinny (>= 0.1.2)
|
||||
sqlite3-ruby
|
||||
thin
|
||||
mailcatcher (0.6.1)
|
||||
activesupport (>= 4.0.0, < 5)
|
||||
eventmachine (~> 1.0.0, <= 1.0.5)
|
||||
mail (~> 2.3)
|
||||
sinatra (~> 1.2)
|
||||
skinny (~> 0.2.3)
|
||||
sqlite3 (~> 1.3)
|
||||
thin (~> 1.5.0)
|
||||
meta-tags (2.0.0)
|
||||
actionpack (>= 3.0.0)
|
||||
meta_request (0.3.4)
|
||||
|
|
@ -261,10 +279,10 @@ GEM
|
|||
rack-contrib (~> 1.1)
|
||||
railties (>= 3.0.0, < 5.0.0)
|
||||
mime-types (1.25.1)
|
||||
mini_portile (0.6.0)
|
||||
mini_portile (0.6.2)
|
||||
minitest (4.7.5)
|
||||
mock_redis (0.13.2)
|
||||
momentjs-rails (2.8.1)
|
||||
mock_redis (0.14.0)
|
||||
momentjs-rails (2.9.0)
|
||||
railties (>= 3.1)
|
||||
mono_logger (1.1.0)
|
||||
multi_json (1.10.1)
|
||||
|
|
@ -276,16 +294,16 @@ GEM
|
|||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (2.9.1)
|
||||
net-ssh (2.9.2)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
netrc (0.7.7)
|
||||
newrelic_rpm (3.9.3.241)
|
||||
netrc (0.10.2)
|
||||
newrelic_rpm (3.9.9.275)
|
||||
ng-rails-csrf (0.1.0)
|
||||
ngmin-rails (0.4.0)
|
||||
rails (>= 3.1)
|
||||
nokogiri (1.6.3.1)
|
||||
mini_portile (= 0.6.0)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
oauth2 (1.0.0)
|
||||
faraday (>= 0.8, < 0.10)
|
||||
jwt (~> 1.0)
|
||||
|
|
@ -306,7 +324,7 @@ GEM
|
|||
omniauth-github (1.1.2)
|
||||
omniauth (~> 1.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-google-oauth2 (0.2.5)
|
||||
omniauth-google-oauth2 (0.2.6)
|
||||
omniauth (> 1.0)
|
||||
omniauth-oauth2 (~> 1.1)
|
||||
omniauth-oauth2 (1.2.0)
|
||||
|
|
@ -315,7 +333,7 @@ GEM
|
|||
oauth2 (~> 1.0)
|
||||
omniauth (~> 1.2)
|
||||
orm_adapter (0.5.0)
|
||||
paperclip (4.2.0)
|
||||
paperclip (4.2.1)
|
||||
activemodel (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
cocaine (~> 0.5.3)
|
||||
|
|
@ -328,15 +346,15 @@ GEM
|
|||
activemodel (>= 4.0.1, < 5.0)
|
||||
puma (2.11.1)
|
||||
rack (>= 1.1, < 2.0)
|
||||
pygments.rb (0.6.0)
|
||||
pygments.rb (0.6.2)
|
||||
posix-spawn (~> 0.3.6)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
yajl-ruby (~> 1.2.0)
|
||||
rack (1.5.2)
|
||||
rack-contrib (1.1.0)
|
||||
rack-contrib (1.2.0)
|
||||
rack (>= 0.9.1)
|
||||
rack-protection (1.5.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rack-throttle (0.3.0)
|
||||
rack (>= 1.0.0)
|
||||
|
|
@ -350,22 +368,25 @@ GEM
|
|||
sprockets-rails (~> 2.0)
|
||||
rails3-generators (1.0.0)
|
||||
railties (>= 3.0.0)
|
||||
rails3-jquery-autocomplete (1.0.14)
|
||||
rails (>= 3.0)
|
||||
rails3-jquery-autocomplete (1.0.15)
|
||||
rails (>= 3.2)
|
||||
railties (4.0.11)
|
||||
actionpack (= 4.0.11)
|
||||
activesupport (= 4.0.11)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.3.2)
|
||||
ransack (1.3.0)
|
||||
rake (10.4.2)
|
||||
ransack (1.6.3)
|
||||
actionpack (>= 3.0)
|
||||
activerecord (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
i18n
|
||||
polyamorous (~> 1.1)
|
||||
rdiscount (2.1.7.1)
|
||||
redcarpet (3.1.2)
|
||||
rb-fsevent (0.9.4)
|
||||
rb-inotify (0.9.5)
|
||||
ffi (>= 0.5.0)
|
||||
rdiscount (2.1.8)
|
||||
redcarpet (3.2.2)
|
||||
redis (3.0.7)
|
||||
redis-actionpack (4.0.0)
|
||||
actionpack (~> 4)
|
||||
|
|
@ -386,8 +407,8 @@ GEM
|
|||
redis-store (1.1.4)
|
||||
redis (>= 2.2)
|
||||
ref (1.0.5)
|
||||
responders (1.0.0)
|
||||
railties (>= 3.2, < 5)
|
||||
responders (1.1.2)
|
||||
railties (>= 3.2, < 4.2)
|
||||
resque (1.25.2)
|
||||
mono_logger (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
|
|
@ -401,12 +422,11 @@ GEM
|
|||
rufus-scheduler (~> 2.0.24)
|
||||
resque-status (0.4.3)
|
||||
resque (~> 1.19)
|
||||
resque_mailer (2.2.6)
|
||||
resque_mailer (2.2.7)
|
||||
actionmailer (>= 3.0)
|
||||
rest-client (1.7.2)
|
||||
mime-types (>= 1.16, < 3.0)
|
||||
netrc (~> 0.7)
|
||||
rinku (1.7.3)
|
||||
rouge (1.3.4)
|
||||
rr (1.1.2)
|
||||
rspec-core (2.14.8)
|
||||
|
|
@ -424,33 +444,35 @@ GEM
|
|||
ruby-haml-js (0.0.5)
|
||||
execjs
|
||||
sprockets (>= 2.0.0)
|
||||
ruby_parser (3.6.4)
|
||||
sexp_processor (~> 4.1)
|
||||
rufus-scheduler (2.0.24)
|
||||
tzinfo (>= 0.3.22)
|
||||
rugged (0.21.0)
|
||||
rugged (0.21.4)
|
||||
russian (0.6.0)
|
||||
i18n (>= 0.5.0)
|
||||
rvm-capistrano (1.5.3)
|
||||
rvm-capistrano (1.5.6)
|
||||
capistrano (~> 2.15.4)
|
||||
safe_yaml (1.0.3)
|
||||
safe_yaml (1.0.4)
|
||||
sanitize (2.1.0)
|
||||
nokogiri (>= 1.4.4)
|
||||
sass (3.2.19)
|
||||
sass-rails (4.0.2)
|
||||
sass (3.4.11)
|
||||
sass-rails (4.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.2.0)
|
||||
sprockets (~> 2.8, <= 2.11.0)
|
||||
sass (>= 3.1.10)
|
||||
sprockets-rails (~> 2.0.0)
|
||||
schema_plus (1.5.3)
|
||||
activerecord (>= 3.2)
|
||||
schema_plus (1.8.6)
|
||||
activerecord (>= 3.2, < 4.3)
|
||||
valuable
|
||||
scrivener (0.0.3)
|
||||
sexp_processor (4.4.5)
|
||||
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.2.1)
|
||||
shoulda-matchers (2.6.2)
|
||||
shoulda-matchers (2.8.0)
|
||||
activesupport (>= 3.0.0)
|
||||
simple_form (3.1.0.rc2)
|
||||
actionpack (~> 4.0)
|
||||
|
|
@ -466,8 +488,8 @@ GEM
|
|||
thin (~> 1.5.0)
|
||||
skype (0.2.8)
|
||||
tmp_cache
|
||||
slim (2.1.0)
|
||||
temple (~> 0.6.9)
|
||||
slim (3.0.2)
|
||||
temple (~> 0.7.3)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
soundmanager-rails (1.0.1)
|
||||
sprockets (2.11.0)
|
||||
|
|
@ -479,13 +501,11 @@ GEM
|
|||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
sprockets (~> 2.8)
|
||||
sqlite3 (1.3.9)
|
||||
sqlite3-ruby (1.3.3)
|
||||
sqlite3 (>= 1.3.3)
|
||||
sqlite3 (1.3.10)
|
||||
state_machine (1.2.0)
|
||||
stringex (2.5.2)
|
||||
temple (0.6.9)
|
||||
test_after_commit (0.2.5)
|
||||
temple (0.7.5)
|
||||
test_after_commit (0.4.0)
|
||||
activerecord (>= 3.2)
|
||||
therubyracer (0.12.1)
|
||||
libv8 (~> 3.16.14.0)
|
||||
|
|
@ -502,29 +522,33 @@ GEM
|
|||
i18n
|
||||
timecop (0.7.1)
|
||||
tmp_cache (0.1.1)
|
||||
tzinfo (0.3.42)
|
||||
uglifier (2.5.3)
|
||||
twitter-text (1.11.0)
|
||||
unf (~> 0.1.0)
|
||||
tzinfo (0.3.43)
|
||||
uglifier (2.7.0)
|
||||
execjs (>= 0.3.0)
|
||||
json (>= 1.8.0)
|
||||
underscore-rails (1.7.0)
|
||||
valuable (0.9.8)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.6)
|
||||
valuable (0.9.9)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
warden (1.2.3)
|
||||
rack (>= 1.0)
|
||||
webmock (1.18.0)
|
||||
webmock (1.20.4)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
whenever (0.9.2)
|
||||
activesupport (>= 2.3.4)
|
||||
whenever (0.9.4)
|
||||
chronic (>= 0.6.3)
|
||||
wikicloth (0.8.1)
|
||||
wikicloth (0.8.2)
|
||||
builder
|
||||
expression_parser
|
||||
rinku
|
||||
twitter-text
|
||||
will_paginate (3.0.7)
|
||||
ya2yaml (0.31)
|
||||
yajl-ruby (1.1.0)
|
||||
yajl-ruby (1.2.1)
|
||||
zeroclipboard-rails (0.1.0)
|
||||
railties (>= 3.1)
|
||||
|
||||
|
|
@ -560,7 +584,7 @@ DEPENDENCIES
|
|||
font-awesome-rails (~> 4.2)
|
||||
friendly_id (~> 5.0)
|
||||
gemoji (~> 2.1)
|
||||
github-linguist (~> 3.1)
|
||||
github-linguist (= 3.1.5)
|
||||
gollum-lib (~> 3.0)
|
||||
grack!
|
||||
grit!
|
||||
|
|
@ -619,6 +643,7 @@ DEPENDENCIES
|
|||
skype
|
||||
slim
|
||||
soundmanager-rails
|
||||
sprockets (= 2.11.0)
|
||||
state_machine (~> 1.2)
|
||||
test_after_commit
|
||||
therubyracer (~> 0.12.1)
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ class Group < Avatar
|
|||
|
||||
belongs_to :owner, class_name: 'User'
|
||||
|
||||
has_many :relations, as: :actor, dependent: :destroy, dependent: :destroy
|
||||
has_many :relations, as: :actor, dependent: :destroy
|
||||
has_many :actors, as: :target, class_name: 'Relation', dependent: :destroy
|
||||
has_many :targets, as: :actor, class_name: 'Relation', dependent: :destroy
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ ActiveAdmin.setup do |config|
|
|||
# by adding them to the comments array.
|
||||
#
|
||||
# config.allow_comments_in = [:admin]
|
||||
config.allow_comments = false
|
||||
config.comments = false
|
||||
|
||||
|
||||
# == Controller Filters
|
||||
|
|
|
|||
Loading…
Reference in New Issue