好乱啊,,,试图迁移到production失败

JJinqiu · Sep 3, 2016 · 554df5f · 554df5f
1 parent e8341a4
commit 554df5f
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,7 +22,6 @@ gem 'jbuilder'
 gem 'pg'
 
 gem 'redcarpet'
-gem 'coderay'
 gem 'rouge'
 gem 'slim-rails'
 gem 'simple_form'
@@ -70,4 +69,3 @@ group :test, :development do
   gem 'factory_girl_rails'
 end
 
-gem 'ssl_requirement'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -305,7 +305,6 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    ssl_requirement (0.1.0)
     temple (0.7.7)
     thor (0.19.1)
     thread_safe (0.3.5)
@@ -334,7 +333,6 @@ DEPENDENCIES
   capybara
   carrierwave
   codeclimate-test-reporter
-  coderay
   coffee-rails (~> 4.1.0)
   database_cleaner
   factory_girl_rails
@@ -378,7 +376,6 @@ DEPENDENCIES
   slim-rails
   spring
   spring-watcher-listen (~> 2.0.0)
-  ssl_requirement
   turbolinks (~> 5.x)
   uglifier (>= 2.7.2)
 

diff --git a/app/views/blogs/_side.html.slim b/app/views/blogs/_side.html.slim
@@ -11,7 +11,8 @@ h4 阅读排行
     li = link_to rs.title, blog_path(rs)
 h4 觉得不错的话打赏一下
 .row
-  li = link_to '打赏', '/reward'
+  li = link_to "打赏", '/reward'
+
 h4 近期评论
 .row
   - @recent_comm.each do |rc|

diff --git a/app/views/common/_friends.html.slim b/app/views/common/_friends.html.slim
@@ -37,4 +37,6 @@ ul.aboutme-index
     .row
       span
         = link_to '　Claris　', 'http://www.cnblogs.com/clrs97/'
-
+    .row
+      span
+        = link_to '　helenkeller　', 'https://helenkeller.top'
diff --git a/config/deploy.rb b/config/deploy.rb
@@ -19,7 +19,7 @@
 set :rvm_path, '/usr/local/rvm/scripts/rvm'
 
 task :environment do
-  invoke :'rvm:use[2.2.3]'
+  invoke :'rvm:use[2.2.4]'
 end
 
 task :setup => :environment do

diff --git a/config/environment.rb b/config/environment.rb
@@ -3,3 +3,6 @@
 
 # Initialize the rails application
 WBlog::Application.initialize!
+
+#ENV
+#ENV['RAILS_ENV'] ||= 'production' 
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -22,7 +22,7 @@
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug = false
   config.assets.quiet = true
 
   config.middleware.insert_before 0, Rack::Cors do

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -3,7 +3,8 @@
 
   # Code is not reloaded between requests.
   config.cache_classes = true
-
+  config.assets.precompile += ['style.css']
+  config.assets.compile = true
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both thread web servers
   # and those relying on copy on write to perform better.
@@ -24,10 +25,10 @@
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
-  # config.assets.css_compressor = :sass
+  config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs.
   config.assets.digest = true
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,4 +37,6 @@ ul.aboutme-index @@
         .row
           span
             = link_to '　Claris　', 'http://www.cnblogs.com/clrs97/'
+        .row
+          span
+            = link_to '　helenkeller　', 'https://helenkeller.top'