temp reverting to prove max wrong.
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"
This reverts commit 78bcb1c321.
This commit is contained in:
parent
570de98365
commit
e55073fdd4
4 changed files with 1180 additions and 0 deletions
1
Gemfile
1
Gemfile
|
|
@ -25,6 +25,7 @@ gem 'omniauth-tumblr'
|
|||
gem 'omniauth-twitter'
|
||||
|
||||
gem 'twitter', '2.0.2'
|
||||
gem 'rails_admin'
|
||||
|
||||
# mail
|
||||
|
||||
|
|
|
|||
33
Gemfile.lock
33
Gemfile.lock
|
|
@ -93,6 +93,7 @@ GEM
|
|||
asset_sync (0.3.1)
|
||||
activemodel
|
||||
fog
|
||||
bbenezech-nested_form (0.0.6)
|
||||
bcrypt-ruby (3.0.1)
|
||||
bootstrap-sass (2.0.2)
|
||||
builder (3.0.0)
|
||||
|
|
@ -119,6 +120,13 @@ GEM
|
|||
ffi (~> 1.0.6)
|
||||
chronic (0.6.7)
|
||||
client_side_validations (3.1.4)
|
||||
coffee-rails (3.1.1)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (~> 3.1.0)
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.3.1)
|
||||
columnize (0.3.6)
|
||||
cookiejar (0.3.0)
|
||||
crack (0.3.1)
|
||||
|
|
@ -221,6 +229,7 @@ GEM
|
|||
highline (1.6.11)
|
||||
hike (1.2.1)
|
||||
hodel_3000_compliant_logger (0.1.0)
|
||||
hpricot (0.8.6)
|
||||
http_accept_language (1.0.2)
|
||||
http_parser.rb (0.5.3)
|
||||
i18n (0.6.0)
|
||||
|
|
@ -234,9 +243,16 @@ GEM
|
|||
jquery-rails (1.0.19)
|
||||
railties (~> 3.0)
|
||||
thor (~> 0.14)
|
||||
jquery-ui-rails (0.2.2)
|
||||
jquery-rails
|
||||
railties (>= 3.1.0)
|
||||
json (1.6.6)
|
||||
jwt (0.1.4)
|
||||
json (>= 1.2.4)
|
||||
kaminari (0.13.0)
|
||||
actionpack (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
railties (>= 3.0.0)
|
||||
kgio (2.7.4)
|
||||
launchy (2.0.3)
|
||||
linecache (0.46)
|
||||
|
|
@ -316,6 +332,9 @@ GEM
|
|||
rack-mount (0.8.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-piwik (0.1.2)
|
||||
rack-pjax (0.5.9)
|
||||
hpricot (~> 0.8.6)
|
||||
rack (~> 1.3)
|
||||
rack-protection (1.2.0)
|
||||
rack
|
||||
rack-rewrite (1.2.1)
|
||||
|
|
@ -333,6 +352,19 @@ GEM
|
|||
railties (= 3.1.4)
|
||||
rails-i18n (0.6.3)
|
||||
i18n (~> 0.5)
|
||||
rails_admin (0.0.1)
|
||||
bbenezech-nested_form (~> 0.0.6)
|
||||
bootstrap-sass (~> 2.0)
|
||||
builder (~> 3.0)
|
||||
coffee-rails (~> 3.1)
|
||||
haml (~> 3.1)
|
||||
jquery-rails (>= 1.0)
|
||||
jquery-ui-rails (~> 0.2.2)
|
||||
kaminari (~> 0.12)
|
||||
rack-pjax (~> 0.5)
|
||||
rails (~> 3.1)
|
||||
remotipart (~> 1.0)
|
||||
sass-rails (~> 3.1)
|
||||
rails_autolink (1.0.6)
|
||||
rails (~> 3.1)
|
||||
railties (3.1.4)
|
||||
|
|
@ -533,6 +565,7 @@ DEPENDENCIES
|
|||
rack-ssl
|
||||
rails (= 3.1.4)
|
||||
rails-i18n
|
||||
rails_admin
|
||||
rails_autolink
|
||||
redcarpet (= 2.0.1)
|
||||
remotipart (~> 1.0)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -3,6 +3,8 @@
|
|||
# the COPYRIGHT file.
|
||||
|
||||
Diaspora::Application.routes.draw do
|
||||
mount RailsAdmin::Engine => '/admin_panel', :as => 'rails_admin'
|
||||
|
||||
get 'oembed' => 'posts#oembed', :as => 'oembed'
|
||||
# Posting and Reading
|
||||
resources :reshares
|
||||
|
|
|
|||
Loading…
Reference in a new issue