Permalink
Browse files

Fixed gem dependencies and javascript include for application layout

  • Loading branch information...
1 parent 7e384a6 commit d81ec9f4ecbe07b0a8a53f9a3cd352f820f7585e JellyFishBoy committed Nov 8, 2013
Showing with 20 additions and 22 deletions.
  1. +1 −1 Capfile
  2. +1 −1 Gemfile
  3. +15 −19 Gemfile.lock
  4. +1 −1 app/views/layouts/application.html.haml
  5. +2 −0 config/environments/production.rb
View
@@ -1,4 +1,4 @@
-load 'deploy'
+load 'deploy' if respond_to?(:namespace)
# Uncomment if you are using Rails' asset pipeline
# load 'deploy/assets'
load 'config/deploy' # remove this line to skip loading any of the default tasks
View
@@ -18,7 +18,7 @@ group :development do
gem 'haml-rails'
gem 'quiet_assets'
gem 'rack-mini-profiler'
- gem 'capistrano'
+ gem 'capistrano', '~> 2.15'
gem 'bullet'
gem 'haml'
gem 'rails_best_practices'
View
@@ -50,12 +50,14 @@ GEM
uniform_notifier (>= 1.4.0)
callsite (0.0.11)
cancan (1.6.10)
- capistrano (3.0.1)
- i18n
- rake (>= 10.0.0)
- sshkit (>= 0.0.23)
- capistrano-unicorn (0.1.10)
- capistrano
+ capistrano (2.15.5)
+ highline
+ net-scp (>= 1.0.0)
+ net-sftp (>= 2.0.0)
+ net-ssh (>= 2.0.14)
+ net-ssh-gateway (>= 1.1.0)
+ capistrano-unicorn (0.2.0)
+ capistrano (< 3.0)
capybara (2.1.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -105,6 +107,7 @@ GEM
activesupport (>= 3.1, < 4.1)
haml (>= 3.1, < 4.1)
railties (>= 3.1, < 4.1)
+ highline (1.6.20)
hike (1.2.3)
i18n (0.6.5)
journey (1.0.4)
@@ -136,12 +139,14 @@ GEM
nested_form (0.3.2)
net-scp (1.1.2)
net-ssh (>= 2.6.5)
+ net-sftp (2.1.2)
+ net-ssh (>= 2.6.5)
net-ssh (2.7.0)
+ net-ssh-gateway (1.2.0)
+ net-ssh (>= 2.6.5)
newrelic_rpm (3.6.9.171)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
- nokogiri (1.6.0-x86-mingw32)
- mini_portile (~> 0.5.0)
orm_adapter (0.4.0)
polyglot (0.3.3)
quiet_assets (1.0.2)
@@ -241,26 +246,18 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.8)
- sqlite3 (1.3.8-x86-mingw32)
- sshkit (1.1.0)
- net-scp
- net-ssh
- term-ansicolor
subexec (0.2.3)
temple (0.6.7)
- term-ansicolor (1.2.2)
- tins (~> 0.8)
thor (0.18.1)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
timers (1.1.0)
- tins (0.12.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.38)
- uglifier (2.3.0)
+ uglifier (2.3.1)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicorn (4.7.0)
@@ -278,15 +275,14 @@ GEM
PLATFORMS
ruby
- x86-mingw32
DEPENDENCIES
bcrypt-ruby!
better_errors
binding_of_caller
bullet
cancan
- capistrano
+ capistrano (~> 2.15)
capistrano-unicorn
capybara
carrierwave
@@ -80,7 +80,7 @@
= link_to "Log in", new_user_session_path
/ /container
%script{src: "//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"}
- = javascript_include_tag "/javascript/bootstrap.min.js", "application", "/javascript/modernizr-2.6.2.min.js"
+ = javascript_include_tag :application
:javascript
var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']];
(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
@@ -22,6 +22,8 @@
# Generate digests for assets URLs
config.assets.digest = true
+ config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
# Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH

0 comments on commit d81ec9f

Please sign in to comment.