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

Bump dragonfly from 0.9.8 to 1.4.0 #521

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

Bump dragonfly from 0.9.8 to 1.4.0 #521

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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem 'sunspot_rails', '~> 1.3.3'
gem 'active_hash' # 用于保存配置型(枚举)记录
gem 'kaminari' # 分页
#用于处理图片(缩略图)
gem 'dragonfly', ' ~> 0.9.8'
gem 'dragonfly', '~> 1.4.0'
gem 'rack-cache', require: 'rack/cache'
gem 'liquid','~> 2.3.0' #模板语言
gem "carrierwave", '~> 0.6.2'
Expand Down
29 changes: 18 additions & 11 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ GEM
activesupport (3.2.7)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.2.8)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
arel (3.0.2)
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
Expand Down Expand Up @@ -143,13 +144,15 @@ GEM
diff-lcs (1.1.3)
doorkeeper (0.4.0)
railties (~> 3.1)
dragonfly (0.9.8)
rack
em-websocket (0.3.6)
addressable (>= 2.1.1)
dragonfly (1.4.0)
addressable (~> 2.3)
multi_json (~> 1.0)
rack (>= 1.3)
em-websocket (0.5.2)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (0.12.10)
eventmachine (1.2.7)
exception_notification (2.6.1)
actionmailer (>= 3.0.4)
execjs (1.4.0)
Expand Down Expand Up @@ -184,6 +187,7 @@ GEM
has_scope (0.5.1)
highline (1.6.13)
hike (1.2.1)
http_parser.rb (0.6.0)
httparty (0.7.8)
crack (= 0.1.8)
httpauth (0.1)
Expand All @@ -204,12 +208,13 @@ GEM
activesupport (>= 3.0.0)
railties (>= 3.0.0)
kgio (2.6.0)
launchy (2.1.0)
addressable (~> 2.2.6)
launchy (2.5.0)
addressable (~> 2.7)
letter_opener (1.0.0)
launchy (>= 2.0.4)
libwebsocket (0.1.5)
libwebsocket (0.1.8)
addressable
websocket
liquid (2.3.0)
listen (0.4.6)
rb-fchange (~> 0.0.5)
Expand Down Expand Up @@ -259,12 +264,13 @@ GEM
polyglot (0.3.3)
posix-spawn (0.3.6)
pr_geohash (1.0.0)
public_suffix (4.0.6)
pygments.rb (0.2.4)
rubypython (~> 0.5.3)
rabl (0.6.13)
activesupport (>= 2.3.14)
multi_json (~> 1.0)
rack (1.4.1)
rack (1.4.7)
rack-cache (1.2)
rack (>= 0.4)
rack-protection (1.2.0)
Expand Down Expand Up @@ -406,6 +412,7 @@ GEM
webmock (1.7.10)
addressable (~> 2.2, > 2.2.5)
crack (>= 0.1.7)
websocket (1.2.9)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand All @@ -431,7 +438,7 @@ DEPENDENCIES
default_value_for
devise (~> 2.1.2)
doorkeeper (~> 0.4.0)
dragonfly (~> 0.9.8)
dragonfly (~> 1.4.0)
exception_notification
factory_girl
factory_girl_rails
Expand Down