diff --git a/Gemfile b/Gemfile index d623077..91a5baa 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' #rails gem -gem 'rails', '4.1.0.rc2' +gem 'rails', '~> 4.1.0' #assets and templates gem 'sass-rails', '~> 4.0.2' @@ -27,7 +27,7 @@ gem 'nokogiri' gem 'httparty' #database -gem 'mongoid', github: "mongoid/mongoid", ref: 'f9e6fdb' +gem 'mongoid', github: "mongoid/mongoid" #file uploading and carrierwave gem "mini_magick", github: 'minimagick/minimagick' diff --git a/app/assets/images/file_type.png b/app/assets/images/file_type.png new file mode 100644 index 0000000..cdc6b2b Binary files /dev/null and b/app/assets/images/file_type.png differ diff --git a/app/assets/images/file_type@2x.png b/app/assets/images/file_type@2x.png new file mode 100644 index 0000000..fe4544b Binary files /dev/null and b/app/assets/images/file_type@2x.png differ diff --git a/app/assets/images/flag.png b/app/assets/images/flag.png new file mode 100644 index 0000000..cee1f3f Binary files /dev/null and b/app/assets/images/flag.png differ diff --git a/app/assets/images/flag@2x.png b/app/assets/images/flag@2x.png new file mode 100644 index 0000000..2bd009e Binary files /dev/null and b/app/assets/images/flag@2x.png differ diff --git a/config/environments/production.rb b/config/environments/production.rb index 7b97915..214bbef 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -23,7 +23,7 @@ Orbit::Application.configure do config.serve_static_assets = false # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier + # config.assets.js_compressor = :uglifier # config.assets.css_compressor = :sass # Do not fallback to assets pipeline if a precompiled asset is missed. @@ -60,6 +60,7 @@ Orbit::Application.configure do # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # config.assets.precompile += %w( search.js ) + config.assets.precompile += %w( ckeditor/* ) # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors.