Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

disable ssl and fix the SCSS compressor bug in rc4 #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

disable ssl and fix the SCSS compressor bug in rc4 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ gem 'mini_magick'
gem 'carrierwave'
gem 'client_side_validations', '~> 3.1.0'

#production environment
gem 'execjs'
gem 'therubyracer'

group :development, :test do
gem 'cucumber-rails'
gem 'capybara', '~> 1.0.0'
Expand Down
5 changes: 0 additions & 5 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ GEM
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
libv8 (3.3.10.2)
machinist (2.0.0.beta2)
mail (2.3.0)
i18n (>= 0.4.0)
Expand Down Expand Up @@ -248,8 +247,6 @@ GEM
subexec (0.1.0)
temple (0.3.2)
term-ansicolor (1.0.5)
therubyracer (0.9.2)
libv8 (~> 3.3.10)
thor (0.14.6)
tilt (1.3.2)
treetop (1.4.9)
Expand Down Expand Up @@ -280,7 +277,6 @@ DEPENDENCIES
delorean
devise (~> 1.4.2)
email_spec
execjs
ffaker
geo_location
has_scope
Expand All @@ -303,6 +299,5 @@ DEPENDENCIES
slim!
slim-rails
squeel (~> 0.8.0)
therubyracer
turn
uglifier
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
* the top of the compiled file, but it's generally better to create a new file per style scope.
*= require_self
*= #require_tree .
*/

/*@import 'inc/reset.css';*/
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
class ApplicationController < ActionController::Base
protect_from_forgery

force_ssl if Rails.env.production?
#force_ssl if Rails.env.production?

layout proc { |controller| controller.request.xhr? ? nil : 'application' }

Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

# Compress both stylesheets and JavaScripts
config.assets.js_compressor = :uglifier
config.assets.css_compressor = :scss
#config.assets.css_compressor = :scss

# Specifies the header that your server uses for sending files
# (comment out if your front-end server doesn't support this)
Expand Down