Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Showing with 24 additions and 13 deletions.
  1. +1 −0 Gemfile
  2. +8 −0 Gemfile.lock
  3. +11 −13 app/views/layouts/application.html.erb
  4. +3 −0 config/environments/production.rb
  5. +1 −0 etc/apache2/sites-available/jishin.me
View
1 Gemfile
@@ -18,6 +18,7 @@ group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
+ gem 'yui-compressor'
end
View
8 Gemfile.lock
@@ -1,6 +1,10 @@
GEM
remote: http://rubygems.org/
specs:
+ POpen4 (0.1.4)
+ Platform (>= 0.4.0)
+ open4
+ Platform (0.4.0)
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
@@ -57,6 +61,7 @@ GEM
modernizr-rails (2.0.6)
multi_json (1.1.0)
nokogiri (1.5.2)
+ open4 (1.3.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -103,6 +108,8 @@ GEM
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
yajl-ruby (1.1.0)
+ yui-compressor (0.9.6)
+ POpen4 (>= 0.1.4)
PLATFORMS
ruby
@@ -119,3 +126,4 @@ DEPENDENCIES
sqlite3
uglifier
yajl-ruby
+ yui-compressor
View
24 app/views/layouts/application.html.erb
@@ -8,8 +8,7 @@
<%= stylesheet_link_tag "application" %>
<%= csrf_meta_tag %>
- <link href="http://fonts.googleapis.com/css?family=Josefin+Sans:100,100italic,300,300italic,400,400italic,600,600italic,700,700italic" rel="stylesheet" type="text/css" >
- <link href="http://fonts.googleapis.com/css?family=Nobile:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css" >
+ <link href='http://fonts.googleapis.com/css?family=Nobile:400,700' rel='stylesheet' type='text/css'>
<%= javascript_include_tag "modernizr" %>
</head>
@@ -21,20 +20,19 @@
<%= yield %>
-<%= javascript_include_tag "application" %>
-
-
<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-22850852-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
</script>
-<script type="text/javascript">
- try{
- var pageTracker = _gat._getTracker("UA-22850852-1");
- pageTracker._trackPageview();
- } catch(err) {}
-</script>
+<%= javascript_include_tag "application" %>
</body>
</html>
View
3 config/environments/production.rb
@@ -13,6 +13,7 @@
# Compress JavaScripts and CSS
config.assets.compress = true
+ config.assets.css_compressor = :yui
# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = true
@@ -57,4 +58,6 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
+
+ config.action_dispatch.x_sendfile_header = "X-Sendfile"
end
View
1 etc/apache2/sites-available/jishin.me
@@ -7,6 +7,7 @@ PassengerRuby /usr/local/rvm/wrappers/ruby-1.9.2-p180/ruby
ServerAlias www.jishin.me
DocumentRoot /home/www/jishin.me/public
+ AddDefaultCharset utf-8
XSendFile on
AddOutputFilterByType DEFLATE text/html text/plain text/xml application/javascript text/css
# Asset Expiration

No commit comments for this range

Something went wrong with that request. Please try again.