diff --git a/CHANGELOG.md b/CHANGELOG.md index 776aa900962a6e4a2365253eae261ebd4a0d7ecb..34dbc3b35b9451c3c74f93d198223f9037746b48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Please view this file on the master branch, on stable branches it's out of date. - Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO) - Fix extra space on Build sidebar on Firefox !7060 - Fix HipChat notifications rendering (airatshigapov, eisnerd) + - Refactor Jira service to use jira-ruby gem - Add hover to trash icon in notes !7008 (blackst0ne) - Fix sidekiq stats in admin area (blackst0ne) - Escape ref and path for relative links !6050 (winniehell) @@ -161,7 +162,6 @@ Please view this file on the master branch, on stable branches it's out of date. - Make searching for commits case insensitive - Fix resolved discussion display in side-by-side diff view !6575 - Optimize GitHub importing for speed and memory - - Refactor Jira service to use jira-ruby gem - API: expose pipeline data in builds API (!6502, Guilherme Salazar) - Notify the Merger about merge after successful build (Dimitris Karakasilis) - Reduce queries needed to find users using their SSH keys when pushing commits diff --git a/Gemfile b/Gemfile index d3de5dce076119836bec1c044e788091b8a4deb4..cee1707c40517d1900dea6113a6cfefdeced1e91 100644 --- a/Gemfile +++ b/Gemfile @@ -162,7 +162,7 @@ gem 'connection_pool', '~> 2.0' gem 'hipchat', '~> 1.5.0' # JIRA integration -gem 'jira-ruby', '~> 1.1.0' +gem 'jira-ruby', '~> 1.1.2' # Flowdock integration gem 'gitlab-flowdock-git-hook', '~> 1.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index 7c8d2380d48ab9fd633313567d54fde36edc3d51..e7567a37e0b25b090ab63d3c123b9e89fbabe432 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,7 +356,7 @@ GEM cause json ipaddress (0.8.3) - jira-ruby (1.1.0) + jira-ruby (1.1.2) activesupport oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) @@ -884,7 +884,7 @@ DEPENDENCIES html-pipeline (~> 1.11.0) httparty (~> 0.13.3) influxdb (~> 0.2) - jira-ruby (~> 1.1.0) + jira-ruby (~> 1.1.2) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) jquery-turbolinks (~> 2.1.0)