Lines 1-4
Link Here
|
1 |
--- Gemfile.orig 2015-12-09 23:40:39 UTC |
1 |
--- Gemfile.orig 2015-12-05 08:47:22 UTC |
2 |
+++ Gemfile |
2 |
+++ Gemfile |
3 |
@@ -1,37 +1,29 @@ |
3 |
@@ -1,37 +1,29 @@ |
4 |
source 'https://rubygems.org' |
4 |
source 'https://rubygems.org' |
Lines 44-49
Link Here
|
44 |
# Optional Markdown support, not for JRuby |
44 |
# Optional Markdown support, not for JRuby |
45 |
group :markdown do |
45 |
group :markdown do |
46 |
gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2") |
46 |
gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2") |
|
|
47 |
@@ -62,7 +54,7 @@ if File.exist?(database_file) |
48 |
gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] |
49 |
gem "activerecord-jdbcmysql-adapter", :platforms => :jruby |
50 |
when /postgresql/ |
51 |
- gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw] |
52 |
+ gem "pg", "~> 0.18.4", :platforms => [:mri, :mingw] |
53 |
gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby |
54 |
when /sqlite3/ |
55 |
gem "sqlite3", :platforms => [:mri, :mingw] |
47 |
@@ -82,23 +74,6 @@ else |
56 |
@@ -82,23 +74,6 @@ else |
48 |
warn("Please configure your config/database.yml first") |
57 |
warn("Please configure your config/database.yml first") |
49 |
end |
58 |
end |