Merge branch 'master' into pr-495ext

Conflicts:
	Octokit/Octokit-Mono.csproj
	Octokit/Octokit-MonoAndroid.csproj
	Octokit/Octokit-Monotouch.csproj
	Octokit/Octokit-Portable.csproj
	Octokit/Octokit-netcore45.csproj
This commit is contained in:
Kristian Hald
2015-03-22 17:18:22 +01:00
203 changed files with 29836 additions and 636 deletions

View File

@@ -161,30 +161,6 @@ namespace Octokit.Reactive
return _connection.GetAndFlattenAllPages<Repository>(ApiUrls.OrganizationRepositories(organization));
}
/// <summary>
/// Returns the HTML rendered README.
/// </summary>
/// <param name="owner">The owner of the repository</param>
/// <param name="name">The name of the repository</param>
/// <returns></returns>
[Obsolete("This method has been obsoleted by Content.GetReadme. Please use that instead.")]
public IObservable<Readme> GetReadme(string owner, string name)
{
return _client.Content.GetReadme(owner, name).ToObservable();
}
/// <summary>
/// Returns just the HTML portion of the README without the surrounding HTML document.
/// </summary>
/// <param name="owner">The owner of the repository</param>
/// <param name="name">The name of the repository</param>
/// <returns></returns>
[Obsolete("This method has been obsoleted by Content.GetReadmeHtml. Please use that instead.")]
public IObservable<string> GetReadmeHtml(string owner, string name)
{
return _client.Content.GetReadmeHtml(owner, name).ToObservable();
}
/// <summary>
/// A client for GitHub's Commit Status API.
/// </summary>