Mercurial > zeropaste
changeset 246:8ab17063419f
Forgot to push production's updates.
| author | edogawaconan <me@myconan.net> |
|---|---|
| date | Mon, 07 Oct 2013 04:18:17 +0000 |
| parents | 8dfbf854fad3 (diff) e413246bb589 (current diff) |
| children | 9aa67da381b0 |
| files | Gemfile Gemfile.lock |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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'
--- 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; +}
--- 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']