From 5977a7f402d0a23d54d2ba1bad86aca1cd8e71f0 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 30 Jul 2015 19:20:16 +0200 Subject: [PATCH 1/2] Adapt version to corresponding OpenProject core version. --- lib/open_project/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/version.rb b/lib/open_project/version.rb index ca2cec021a..3ec4a54e70 100644 --- a/lib/open_project/version.rb +++ b/lib/open_project/version.rb @@ -33,7 +33,7 @@ module OpenProject module VERSION #:nodoc: MAJOR = 4 MINOR = 1 - PATCH = 4 + PATCH = 5 TINY = PATCH # Redmine compat # Used by semver to define the special version (if any). From 086acffc7405d753b074d915ad02a5966ca49354 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Tue, 29 Sep 2015 10:25:42 +0200 Subject: [PATCH 2/2] Bump selenium-webdriver to 2.47.1 This fixes crashing Firefox upon starting protractor with `directConnect: true`. See 3faf92df5ff146a060b7ca93a9f882a832dff4d5 for the original commit. --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 959f81e655..1aab5918fc 100644 --- a/Gemfile +++ b/Gemfile @@ -159,7 +159,7 @@ group :test do gem 'capybara-screenshot', '~> 1.0.4' gem 'capybara-select2', github: 'goodwill/capybara-select2' gem 'capybara-ng', '~> 0.2.1' - gem 'selenium-webdriver', '~> 2.45.0' + gem 'selenium-webdriver', '~> 2.47.1' gem 'timecop', '~> 0.7.1' gem 'rb-readline', "~> 0.5.1" # ruby on CI needs this diff --git a/Gemfile.lock b/Gemfile.lock index 806594ab9a..c1195a0fbb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -418,7 +418,7 @@ GEM structured_warnings (>= 0.1.3) rubyzip (1.1.6) sass (3.4.12) - selenium-webdriver (2.45.0) + selenium-webdriver (2.47.1) childprocess (~> 0.5) multi_json (~> 1.0) rubyzip (~> 1.0) @@ -559,7 +559,7 @@ DEPENDENCIES rubytree (~> 0.8.3) sass (~> 3.4.12) sass-rails! - selenium-webdriver (~> 2.45.0) + selenium-webdriver (~> 2.47.1) shoulda shoulda-matchers (~> 2.5.0) simplecov (= 0.8.0.pre)