Bazaar Integration for Visual Studio

~rahmadani/bzr-visualstudio/+git/trunk:shana/merge-pr-gist

  1. Git
  2. lp:~rahmadani/bzr-visualstudio/+git/trunk
  3. shana/merge-pr-gist
Last commit made on 2016-05-25
Get this branch:
git clone -b shana/merge-pr-gist https://git.launchpad.net/~rahmadani/bzr-visualstudio/+git/trunk

Branch merges

Branch information

Name:
shana/merge-pr-gist
Repository:
lp:~rahmadani/bzr-visualstudio/+git/trunk

Recent commits

4c56262... by Andreia Gaita

Fix null assertion

a531922... by Andreia Gaita

Merge master into shana/merge-pr-gist

833aa84... by Andreia Gaita

Add ui controller gist support, fix tests

d522bd2... by Andreia Gaita

Fix build

de8c3c9... by Andreia Gaita

Merge grokys/feature/gist-support into feature/pr/views

b028aa6... by Andreia Gaita

Merge pull request #316 from github/fixes/309-login-com-enterprise-order

Use Merge instead of Amb on login control.

74b9b63... by Steven Kirk <email address hidden>

Add unit test for #309

Confirmed that the unit test fails on master but passes with the fix.

3c5cb88... by Andreia Gaita

Merge pull request #313 from github/fixes/307-dont-display-error-icon-by-default

Only display error adorner after user interaction.

427f206... by Steven Kirk <email address hidden>

Use Merge instead of Amb on login control.

Fixes #309. `Observable.Amb` "emits all of the items from only the first
of these Observables to emit an item or notification". This means that
if the user tries to login first to .com with an invalid login, then
tries to login to enterprise with a valid login the login from
enterprise will be ignored because the .com observable fired first.
Instead use `Observable.Merge` which will emit authentication results
from both in any order.

7a6586f... by Andreia Gaita

Merge pull request #314 from github/fixes/311-objectdisposedexception-on-cancelled

Don't call cancel.OnCompleted after disposal.