Download as
Browse Code »

Commit 1547d0a18f3816d94aa9740a025be3e0ccb200c4

Authored by Stephen Crosby
2 parents 7694e7de 571a7585
Exists in master and in 1 other branch production

Merge branch 'features/extract_issue_tracker' of github.com:errbit/errbit into f… 

…eatures/extract_issue_tracker

Conflicts:
	Gemfile
Showing 2 changed files with 19 additions and 3 deletions   Show diff stats
Gemfile
  Diff comments   View file @1547d0a
... ... @@ -31,6 +31,7 @@ gem 'errbit_plugin'
31 31 gem 'errbit_github_plugin'
32 32 gem 'errbit_lighthouse_plugin'
33 33 gem 'errbit_redmine_plugin'
  34 +gem 'errbit_bitbucket_plugin'
34 35 gem 'errbit_pivotal_plugin'
35 36  
36 37 # Notification services
... ...
Gemfile.lock
  Diff comments   View file @1547d0a
... ... @@ -44,6 +44,13 @@ GEM
44 44 erubis (>= 2.6.6)
45 45 binding_of_caller (0.7.2)
46 46 debug_inspector (>= 0.0.1)
  47 + bitbucket_rest_api (0.1.5)
  48 + faraday (~> 0.8.1)
  49 + faraday_middleware (~> 0.9.0)
  50 + hashie (~> 2.0.5)
  51 + multi_json (~> 1.3)
  52 + nokogiri (>= 1.5.2)
  53 + simple_oauth
47 54 builder (3.0.4)
48 55 callsite (0.0.11)
49 56 campy (1.0.0)
... ... @@ -90,6 +97,10 @@ GEM
90 97 email_spec (1.5.0)
91 98 launchy (~> 2.1)
92 99 mail (~> 2.2)
  100 + errbit_bitbucket_plugin (0.1.0)
  101 + bitbucket_rest_api
  102 + errbit_plugin
  103 + faraday (~> 0.8.1)
93 104 errbit_github_plugin (0.1.0)
94 105 errbit_plugin
95 106 octokit
... ... @@ -106,8 +117,10 @@ GEM
106 117 erubis (2.7.0)
107 118 execjs (2.0.2)
108 119 fabrication (2.9.0)
109   - faraday (0.9.0)
110   - multipart-post (>= 1.2, < 3)
  120 + faraday (0.8.9)
  121 + multipart-post (~> 1.2.0)
  122 + faraday_middleware (0.9.1)
  123 + faraday (>= 0.7.4, < 0.10)
111 124 flowdock (0.3.1)
112 125 httparty (~> 0.7)
113 126 multi_json
... ... @@ -180,7 +193,7 @@ GEM
180 193 moped (1.5.1)
181 194 multi_json (1.10.1)
182 195 multi_xml (0.5.5)
183   - multipart-post (2.0.0)
  196 + multipart-post (1.2.0)
184 197 net-scp (1.1.2)
185 198 net-ssh (>= 2.6.5)
186 199 net-sftp (2.1.2)
... ... @@ -303,6 +316,7 @@ GEM
303 316 sawyer (0.5.5)
304 317 addressable (~> 2.3.5)
305 318 faraday (~> 0.8, < 0.10)
  319 + simple_oauth (0.3.0)
306 320 simplecov (0.7.1)
307 321 multi_json (~> 1.0)
308 322 simplecov-html (~> 0.7.1)
... ... @@ -374,6 +388,7 @@ DEPENDENCIES
374 388 devise
375 389 draper
376 390 email_spec
  391 + errbit_bitbucket_plugin
377 392 errbit_github_plugin
378 393 errbit_lighthouse_plugin
379 394 errbit_pivotal_plugin
... ...