From dabb98a871cfb6bf1f226eef14535b3cf7c10568 Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Tue, 7 Jul 2015 10:31:47 +0200 Subject: [PATCH] Adjust openproject-translations plugin branch Signed-off-by: Alex Coles --- Gemfile | 2 +- Gemfile.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f43a817018f..b49a16c3405 100644 --- a/Gemfile +++ b/Gemfile @@ -224,7 +224,7 @@ platforms :jruby do end group :opf_plugins do - gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', branch: 'release/4.2' + gem 'openproject-translations', git:'https://github.com/opf/openproject-translations.git', branch: 'feature/rails4' end # Load Gemfile.local, Gemfile.plugins and plugins' Gemfiles diff --git a/Gemfile.lock b/Gemfile.lock index 195e690aae2..b8837024ed4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -22,13 +22,13 @@ GIT GIT remote: https://github.com/opf/openproject-translations.git - revision: 99f40603ca7778855eddf9510538070827254423 - branch: release/4.2 + revision: 88c14fc8b86e72ef12739581aca8d97a6e8b7939 + branch: feature/rails4 specs: - openproject-translations (4.2.0.pre.alpha) + openproject-translations (4.3.0.pre.alpha) crowdin-api (~> 0.2.4) mixlib-shellout (~> 2.1.0) - rails (~> 3.2.14) + rails (~> 4.0.13) rubyzip GIT @@ -244,7 +244,7 @@ GEM mail (2.6.3) mime-types (>= 1.16, < 3) method_source (0.8.2) - mime-types (2.5) + mime-types (1.25.1) mini_portile (0.6.2) minitest (4.7.5) mixlib-shellout (2.1.0)