Merge commit '5c998b602f4f0ce5ba51d6da9a4c462d8ec34e97'

Conflicts:
	Gemfile.lock

Gemfile

 source 'https://rubygems.org'
 source 'https://rubygems.org'
 
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '4.0.1'
+ruby '2.0.0'
 
 
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 4.0.2'
 
 
 # Use SCSS for stylesheets
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'
 gem 'sass-rails', '~> 4.0.0'
@@ -52,6 +51,9 @@ gem 'omniauth-google-oauth2'
 gem 'redcarpet'
 gem 'redcarpet'
 
 
 group :development do
 group :development do
+  # Use sqlite3 as the database for Active Record
+  gem 'sqlite3'
+
   gem 'better_errors'
   gem 'better_errors'
   gem 'binding_of_caller'
   gem 'binding_of_caller'
 
 

Gemfile.lock

 GEM
 GEM
   remote: https://rubygems.org/
   remote: https://rubygems.org/
   specs:
   specs:
-    actionmailer (4.0.1)
-      actionpack (= 4.0.1)
+    actionmailer (4.0.2)
+      actionpack (= 4.0.2)
       mail (~> 2.5.4)
       mail (~> 2.5.4)
-    actionpack (4.0.1)
-      activesupport (= 4.0.1)
+    actionpack (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.1)
-      activesupport (= 4.0.1)
+    activemodel (4.0.2)
+      activesupport (= 4.0.2)
       builder (~> 3.1.0)
       builder (~> 3.1.0)
-    activerecord (4.0.1)
-      activemodel (= 4.0.1)
+    activerecord (4.0.2)
+      activemodel (= 4.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.1)
+      activesupport (= 4.0.2)
       arel (~> 4.0.0)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.1)
+    activesupport (4.0.2)
       i18n (~> 0.6, >= 0.6.4)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       multi_json (~> 1.3)
@@ -58,8 +58,8 @@ GEM
     hashie (2.0.5)
     hashie (2.0.5)
     hike (1.2.3)
     hike (1.2.3)
     httpauth (0.2.0)
     httpauth (0.2.0)
-    i18n (0.6.5)
-    jbuilder (1.5.2)
+    i18n (0.6.9)
+    jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
       multi_json (>= 1.2.0)
     json (1.8.1)
     json (1.8.1)
@@ -93,22 +93,22 @@ GEM
     rack (1.5.2)
     rack (1.5.2)
     rack-test (0.6.2)
     rack-test (0.6.2)
       rack (>= 1.0)
       rack (>= 1.0)
-    rails (4.0.1)
-      actionmailer (= 4.0.1)
-      actionpack (= 4.0.1)
-      activerecord (= 4.0.1)
-      activesupport (= 4.0.1)
+    rails (4.0.2)
+      actionmailer (= 4.0.2)
+      actionpack (= 4.0.2)
+      activerecord (= 4.0.2)
+      activesupport (= 4.0.2)
       bundler (>= 1.3.0, < 2.0)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.1)
+      railties (= 4.0.2)
       sprockets-rails (~> 2.0.0)
       sprockets-rails (~> 2.0.0)
     rails_12factor (0.0.2)
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_serve_static_assets
       rails_stdout_logging
       rails_stdout_logging
     rails_serve_static_assets (0.0.1)
     rails_serve_static_assets (0.0.1)
     rails_stdout_logging (0.0.3)
     rails_stdout_logging (0.0.3)
-    railties (4.0.1)
-      actionpack (= 4.0.1)
-      activesupport (= 4.0.1)
+    railties (4.0.2)
+      actionpack (= 4.0.2)
+      activesupport (= 4.0.2)
       rake (>= 0.8.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.0)
     rake (10.1.0)
@@ -145,7 +145,7 @@ GEM
       polyglot
       polyglot
       polyglot (>= 0.3.1)
       polyglot (>= 0.3.1)
     tzinfo (0.3.38)
     tzinfo (0.3.38)
-    uglifier (2.3.1)
+    uglifier (2.3.2)
       execjs (>= 0.3.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
       json (>= 1.8.0)
     warden (1.2.3)
     warden (1.2.3)
@@ -162,7 +162,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jbuilder (~> 1.2)
   omniauth-google-oauth2
   omniauth-google-oauth2
   pg
   pg
-  rails (= 4.0.1)
+  rails (~> 4.0.2)
   rails_12factor
   rails_12factor
   redcarpet
   redcarpet
   sass-rails (~> 4.0.0)
   sass-rails (~> 4.0.0)

app/views/posts/_form.html.erb

@@ -72,7 +72,7 @@
     'use strict';
     'use strict';
 
 
     var confirmUnload = function() {
     var confirmUnload = function() {
-      return '前のページに戻りますか？';
+      return 'このページを離れますか？';
     };
     };
     $(window).on('beforeunload', confirmUnload);
     $(window).on('beforeunload', confirmUnload);
     $('#save_button').on('click', function(){
     $('#save_button').on('click', function(){

config/environments/production.rb

@@ -20,7 +20,7 @@ Rendezvous::Application.configure do
   # config.action_dispatch.rack_cache = true
   # config.action_dispatch.rack_cache = true
 
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_assets = true
 
 
   # Compress JavaScripts and CSS.
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
   config.assets.js_compressor = :uglifier