From 5d1a5a0b11c76472d857e6ab2aaccb7d5ea4fe9f Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 10 Mar 2015 11:50:27 +0800
Subject: [PATCH] =?UTF-8?q?=20#1738=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                                   | 10 ++++++----
 app/controllers/attachments_controller.rb |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 299af4509..34e81cef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,8 +25,10 @@ gem 'rufus-scheduler'
 #gem 'dalli', path: 'lib/dalli-2.7.2'
 group :development do
   gem 'grape-swagger'
-  gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
+  #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'
   #gem 'puma'
+  gem 'pry-rails'
+  gem 'pry-byebug'
   gem 'better_errors', path: 'lib/better_errors'
   gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler'
 end
@@ -50,8 +52,8 @@ group :test do
   #end
 end
 
-  gem 'rspec-rails' , '2.13.1'
-  gem 'guard-rspec','2.5.0'
+ # gem 'rspec-rails' , '2.13.1'
+ # gem 'guard-rspec','2.5.0'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
@@ -95,7 +97,7 @@ if File.exist?(database_file)
     adapters.each do |adapter|
       case adapter
       when 'mysql2'
-        gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw]
+        gem "mysql2", "= 0.3.18", :platforms => [:mri, :mingw]
         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
       when 'mysql'
         gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 252d823e9..ccc879c1c 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -97,12 +97,10 @@ class AttachmentsController < ApplicationController
     end
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
-
       if stale?(:etag => @attachment.digest)
-        # images are sent inline
         send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                   :type => detect_content_type(@attachment),
-                  :disposition => (@attachment.image? ? 'inline' : 'attachment')
+                  :disposition => 'attachment'    #inline can open in browser
       end
 
     else