Skip to content

Commit bade307

Browse files
committed
regressed active_admin due to subdirectory bug
1 parent 417c095 commit bade307

File tree

4 files changed

+25
-14
lines changed

4 files changed

+25
-14
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gem 'therubyracer'
1616
gem 'less-rails', '~> 2.5.0' #Sprockets (what Rails 3.1 uses for its asset pipeline) supports LESS
1717
gem 'twitter-bootstrap-rails', '~> 2.2.7'
1818
gem 'bootstrap-datepicker-rails'
19-
gem 'activeadmin', '= 0.6.3' # http://0.0.0.0:3000/admin
19+
gem 'activeadmin', '= 0.5.1' # http://0.0.0.0:3000/admin
2020
gem 'meta_search', '>= 1.1.0.pre'
2121
gem 'friendly_id'
2222
gem 'paperclip', '~> 3.5.4'

Gemfile.lock

+14-12
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,18 @@ GEM
1414
rack-cache (~> 1.2)
1515
rack-test (~> 0.6.1)
1616
sprockets (~> 2.2.1)
17-
activeadmin (0.6.3)
18-
arbre (~> 1.0)
19-
bourbon (>= 1.0.0, < 4)
20-
devise (>= 1.5.4, < 4, != 2.2.2, != 2.2.1, != 2.2.0, != 2.1.2, != 2.1.1, != 2.1.0, != 2.0.4, != 2.0.3, != 2.0.2, != 2.0.1, != 2.0.0)
21-
formtastic (~> 2.0)
22-
inherited_resources (~> 1.3)
23-
jquery-rails (>= 1.0.0, < 3)
24-
kaminari (~> 0.13, != 0.15.0)
25-
meta_search (~> 1.0)
26-
rails (>= 3.0.0, < 4)
27-
sass (~> 3.1)
17+
activeadmin (0.5.1)
18+
arbre (>= 1.0.1)
19+
bourbon (>= 1.0.0)
20+
devise (>= 1.1.2)
21+
fastercsv
22+
formtastic (>= 2.0.0)
23+
inherited_resources (>= 1.3.1)
24+
jquery-rails (>= 1.0.0)
25+
kaminari (>= 0.13.0)
26+
meta_search (>= 0.9.2)
27+
rails (>= 3.0.0)
28+
sass (>= 3.1.0)
2829
activemodel (3.2.17)
2930
activesupport (= 3.2.17)
3031
builder (~> 3.0.0)
@@ -92,6 +93,7 @@ GEM
9293
erubis (2.7.0)
9394
eventmachine (1.0.3)
9495
execjs (2.0.2)
96+
fastercsv (1.5.5)
9597
figaro (0.7.0)
9698
bundler (~> 1.0)
9799
rails (>= 3, < 5)
@@ -240,7 +242,7 @@ PLATFORMS
240242
ruby
241243

242244
DEPENDENCIES
243-
activeadmin (= 0.6.3)
245+
activeadmin (= 0.5.1)
244246
awesome_print
245247
better_errors
246248
binding_of_caller

config.ru

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# This file is used by Rack-based servers to start the application.
22

33
require ::File.expand_path('../config/environment', __FILE__)
4-
run AppcastServer::Application
4+
5+
if Rails.env.development?
6+
map '/appcast' do
7+
run AppcastServer::Application
8+
end
9+
else
10+
run AppcastServer::Application
11+
end

config/environments/development.rb

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
# Devise
3939
config.action_mailer.default_url_options = { :host => 'localhost:3000' }
4040

41+
config.action_controller.relative_url_root = '/appcast'
42+
4143
# config.paperclip_defaults = {:storage => :fog, :fog_credentials => {:provider => "Local", :local_root => "#{Rails.root}/public"}, :fog_directory => "", :fog_host => "localhost"}
4244

4345
end

0 commit comments

Comments
 (0)