summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2018-11-19 09:58:59 +0000
committerSean McGivern <sean@gitlab.com>2018-11-19 09:58:59 +0000
commit7548c4d5af9198dd81adf751b41b15e9c8e5349c (patch)
treebb524a43e0bc5f42367cbd6658117b3b59f17f1b
parentc70c4038290f9898b516473413acfae362bc1627 (diff)
parent8759096456ad78e02960b17e12b587d00f7b3f13 (diff)
downloadgitlab-ce-7548c4d5af9198dd81adf751b41b15e9c8e5349c.tar.gz
Merge branch '54004-update-asana-to-0.8.1' into 'master'
Update asana to 0.8.1 Closes #54004 See merge request gitlab-org/gitlab-ce!23039
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--Gemfile.rails4.lock4
-rw-r--r--changelogs/unreleased/54004-update-asana-to-0-8-1.yml5
4 files changed, 10 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 0fcbd659356..65e09688c55 100644
--- a/Gemfile
+++ b/Gemfile
@@ -226,7 +226,7 @@ gem 'slack-notifier', '~> 1.5.1'
gem 'hangouts-chat', '~> 0.0.5'
# Asana integration
-gem 'asana', '~> 0.6.0'
+gem 'asana', '~> 0.8.1'
# FogBugz integration
gem 'ruby-fogbugz', '~> 0.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77d0abd247e..6459cdff7a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -53,7 +53,7 @@ GEM
aes_key_wrap (1.0.1)
akismet (2.0.0)
arel (7.1.4)
- asana (0.6.0)
+ asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
@@ -942,7 +942,7 @@ DEPENDENCIES
acts-as-taggable-on (~> 5.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
- asana (~> 0.6.0)
+ asana (~> 0.8.1)
asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index 62f4f378245..657975da2a4 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -50,7 +50,7 @@ GEM
aes_key_wrap (1.0.1)
akismet (2.0.0)
arel (6.0.4)
- asana (0.6.0)
+ asana (0.8.1)
faraday (~> 0.9)
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
@@ -933,7 +933,7 @@ DEPENDENCIES
acts-as-taggable-on (~> 5.0)
addressable (~> 2.5.2)
akismet (~> 2.0)
- asana (~> 0.6.0)
+ asana (~> 0.8.1)
asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
diff --git a/changelogs/unreleased/54004-update-asana-to-0-8-1.yml b/changelogs/unreleased/54004-update-asana-to-0-8-1.yml
new file mode 100644
index 00000000000..a47b4f3c4d9
--- /dev/null
+++ b/changelogs/unreleased/54004-update-asana-to-0-8-1.yml
@@ -0,0 +1,5 @@
+---
+title: Update asana to 0.8.1
+merge_request: 23039
+author: Takuya Noguchi
+type: other