Fixed broken conventions. Wrote a integrationstests that performs an actual merge between two branches.

This commit is contained in:
Lars Tabro Sørensen
2015-01-31 23:15:26 +01:00
parent 150e38a264
commit 7a6b988f8a
16 changed files with 176 additions and 41 deletions

View File

@@ -28,6 +28,7 @@ namespace Octokit.Reactive
Commits = new ObservableRepositoryCommitsClient(client);
DeployKeys = new ObservableRepositoryDeployKeysClient(client);
Content = new ObservableRepositoryContentsClient(client);
Merging = new ObservableMergingClient(client);
}
/// <summary>
@@ -196,6 +197,15 @@ namespace Octokit.Reactive
/// </remarks>
public IObservableRepositoryContentsClient Content { get; private set; }
/// <summary>
/// Client for GitHub's Repository Merging API
/// </summary>
/// <remarks>
/// See the <a href="https://developer.github.com/v3/repos/merging/">Merging API documentation</a> for more details
///</remarks>
public IObservableMergingClient Merging { get; private set; }
/// <summary>
/// Gets all the branches for the specified repository.
/// </summary>