Attachment 166718 Details for Bug 207007 – fix postgresql adapter through Gemfile patch...

[patch] fix postgresql adapter through Gemfile patch...

redmine-pg.diff (text/plain), 1.34 KB, created by Johannes Jost Meixner on 2016-02-07 20:54:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johannes Jost Meixner

Created: 2016-02-07 20:54:29 UTC

Size: 1.34 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 408136)
>+++ Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	redmine
> PORTVERSION=	2.6.9
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://www.redmine.org/releases/
> 
>Index: files/patch-Gemfile
>===================================================================
>--- files/patch-Gemfile	(revision 408136)
>+++ files/patch-Gemfile	(working copy)
>@@ -1,4 +1,4 @@
>---- Gemfile.orig	2015-12-09 23:40:39 UTC
>+--- Gemfile.orig	2015-12-05 08:47:22 UTC
> +++ Gemfile
> @@ -1,37 +1,29 @@
>  source 'https://rubygems.org'
>@@ -44,6 +44,15 @@
>    # Optional Markdown support, not for JRuby
>    group :markdown do
>      gem "redcarpet", (RUBY_VERSION < "1.9" ? "~> 2.3.0" : "~> 3.3.2")
>+@@ -62,7 +54,7 @@ if File.exist?(database_file)
>+         gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw]
>+         gem "activerecord-jdbcmysql-adapter", :platforms => :jruby
>+       when /postgresql/
>+-        gem "pg", "~> 0.17.1", :platforms => [:mri, :mingw]
>++        gem "pg", "~> 0.18.4", :platforms => [:mri, :mingw]
>+         gem "activerecord-jdbcpostgresql-adapter", :platforms => :jruby
>+       when /sqlite3/
>+         gem "sqlite3", :platforms => [:mri, :mingw]
> @@ -82,23 +74,6 @@ else
>    warn("Please configure your config/database.yml first")
>  end

Actions: View | Diff

Attachments on bug 207007: 166718