diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 11:41:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-28 11:41:20 +0000 |
| commit | 292c982e346843f8979ec5b302a8ad01dd09917a (patch) | |
| tree | defc3359cc7ff3336e5c8df97c72693822549adf /Gemfile.lock | |
| parent | 8b0cdf4c832ca5f40a6c24207021ed122984b280 (diff) | |
| parent | 3d7a287c55e456b4fb3c4480147ef9b697a0f42c (diff) | |
| download | gitlab-ce-292c982e346843f8979ec5b302a8ad01dd09917a.tar.gz | |
Merge branch 'issue_1008_1' into 'master'
Jira refactoring to jira gem
part of gitlab-org/gitlab-ee#1008
Original MR: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2572/commits
See merge request !6598
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 536435d3cf6..f8116e1894f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -356,6 +356,9 @@ GEM cause json ipaddress (0.8.3) + jira-ruby (1.1.2) + activesupport + oauth (~> 0.5, >= 0.5.0) jquery-atwho-rails (1.3.2) jquery-rails (4.1.1) rails-dom-testing (>= 1, < 3) @@ -421,7 +424,7 @@ GEM mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) - oauth (0.4.7) + oauth (0.5.1) oauth2 (1.2.0) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -881,6 +884,7 @@ DEPENDENCIES html-pipeline (~> 1.11.0) httparty (~> 0.13.3) influxdb (~> 0.2) + jira-ruby (~> 1.1.2) jquery-atwho-rails (~> 1.3.2) jquery-rails (~> 4.1.0) jquery-turbolinks (~> 2.1.0) |