Commit 89641650449da2f17d27bebc902f0c95d4986bf4

Authored by Francis Gulotta
1 parent 4f4dddbe
Exists in master and in 1 other branch production

Upgrade from Octokit 1x to 2x to resolve issues with oauth2

One breaking change was how to get the urls of objects from the github objects. The only place we used this has been updated.
Gemfile
... ... @@ -41,7 +41,7 @@ gem 'pivotal-tracker'
41 41 # Fogbugz
42 42 gem 'ruby-fogbugz', :require => 'fogbugz'
43 43 # Github Issues
44   -gem 'octokit', '~> 1.18'
  44 +gem 'octokit', '~> 2.0'
45 45 # Gitlab
46 46 gem 'gitlab', '~> 3.0.0'
47 47  
... ...
Gemfile.lock
... ... @@ -101,7 +101,7 @@ GEM
101 101 erubis (2.7.0)
102 102 execjs (2.0.2)
103 103 fabrication (2.8.1)
104   - faraday (0.8.8)
  104 + faraday (0.8.9)
105 105 multipart-post (~> 1.2.0)
106 106 faraday_middleware (0.9.0)
107 107 faraday (>= 0.7.4, < 0.9)
... ... @@ -182,7 +182,7 @@ GEM
182 182 rails (>= 3.2.0)
183 183 railties (>= 3.2.0)
184 184 moped (1.5.1)
185   - multi_json (1.8.2)
  185 + multi_json (1.8.4)
186 186 multi_xml (0.5.5)
187 187 multipart-post (1.2.0)
188 188 net-scp (1.1.2)
... ... @@ -192,7 +192,6 @@ GEM
192 192 net-ssh (2.7.0)
193 193 net-ssh-gateway (1.2.0)
194 194 net-ssh (>= 2.6.5)
195   - netrc (0.7.7)
196 195 nokogiri (1.5.10)
197 196 nokogiri-happymapper (0.5.8)
198 197 nokogiri (~> 1.5)
... ... @@ -203,13 +202,8 @@ GEM
203 202 jwt (~> 0.1.4)
204 203 multi_json (~> 1.0)
205 204 rack (~> 1.2)
206   - octokit (1.25.0)
207   - addressable (~> 2.2)
208   - faraday (~> 0.8)
209   - faraday_middleware (~> 0.9)
210   - hashie (~> 2.0)
211   - multi_json (~> 1.3)
212   - netrc (~> 0.7.7)
  205 + octokit (2.7.1)
  206 + sawyer (~> 0.5.2)
213 207 omniauth (1.1.4)
214 208 hashie (>= 1.2, < 3)
215 209 rack
... ... @@ -311,6 +305,9 @@ GEM
311 305 json
312 306 rest-client
313 307 safe_yaml (0.9.7)
  308 + sawyer (0.5.3)
  309 + addressable (~> 2.3.5)
  310 + faraday (~> 0.8, < 0.10)
314 311 simple_oauth (0.2.0)
315 312 simplecov (0.7.1)
316 313 multi_json (~> 1.0)
... ... @@ -403,7 +400,7 @@ DEPENDENCIES
403 400 mongoid
404 401 mongoid-rspec
405 402 mongoid_rails_migrations
406   - octokit (~> 1.18)
  403 + octokit (~> 2.0)
407 404 omniauth-github
408 405 oruen_redmine_client
409 406 pivotal-tracker
... ...
app/models/issue_trackers/github_issues_tracker.rb
... ... @@ -41,7 +41,7 @@ if defined? Octokit
41 41 body_template.result(binding).unpack('C*').pack('U*')
42 42 )
43 43 problem.update_attributes(
44   - :issue_link => issue.html_url,
  44 + :issue_link => issue.rels[:html].href,
45 45 :issue_type => Label
46 46 )
47 47  
... ...