# HG changeset patch
# User edogawaconan <me@myconan.net>
# Date 1381119497 0
# Node ID 8ab17063419fafd79fd12a7a30710a85d258f7a5
# Parent  8dfbf854fad385d52df7deb28b045fe069884a69# Parent  e413246bb589a89a1787d95e354c2f27763539c6
Forgot to push production's updates.

diff -r e413246bb589 -r 8ab17063419f Gemfile
--- a/Gemfile	Mon Oct 07 13:15:37 2013 +0900
+++ b/Gemfile	Mon Oct 07 04:18:17 2013 +0000
@@ -11,16 +11,12 @@
 gem 'jruby-openssl', platforms: :jruby
 gem 'actionpack-page_caching'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails', '~> 4.0.0.rc1'
+gem 'sass-rails', '~> 4.0.0.rc1'
 
-  gem 'uglifier'
-  gem 'anjlab-bootstrap-rails', '~> 2.3.0', require: 'bootstrap-rails'
+gem 'uglifier'
+gem 'anjlab-bootstrap-rails', '~>2.3.0', require: 'bootstrap-rails'
 
-  gem 'therubyrhino', platforms: :jruby
-end
+gem 'therubyrhino', platforms: :jruby
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
diff -r e413246bb589 -r 8ab17063419f Gemfile.lock
diff -r e413246bb589 -r 8ab17063419f app/assets/stylesheets/pastes.css
--- a/app/assets/stylesheets/pastes.css	Mon Oct 07 13:15:37 2013 +0900
+++ b/app/assets/stylesheets/pastes.css	Mon Oct 07 04:18:17 2013 +0000
@@ -5,3 +5,7 @@
   -moz-box-sizing: border-box;    /* Firefox, other Gecko */
   box-sizing: border-box;         /* Opera/IE 8+ */
 }
+
+#pl > pre {
+  word-break: normal;
+}
diff -r e413246bb589 -r 8ab17063419f config/default_config.rb
--- a/config/default_config.rb	Mon Oct 07 13:15:37 2013 +0900
+++ b/config/default_config.rb	Mon Oct 07 04:18:17 2013 +0000
@@ -1,5 +1,5 @@
 CONFIG['standalone'] = true if CONFIG['standalone'].nil?
 CONFIG['newrelic'] = false if CONFIG['newrelic'].nil?
-CONFIG['bundler_groups'] ||= Rails.groups(:assets => %w(development test))
+CONFIG['bundler_groups'] ||= [:default, Rails.env]
 CONFIG['bundler_groups'] << 'standalone' if CONFIG['standalone']
 CONFIG['bundler_groups'] << 'newrelic' if CONFIG['newrelic']