diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-07-26 08:00:42 -0700 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2013-07-26 08:00:42 -0700 |
| commit | 06e98c0f9bdf73aa57a58587910236ca29dfd4e3 (patch) | |
| tree | fa2a87f095d47d4b95b8dc6f0e897690ee0450e4 | |
| parent | 8aecfc375c10033ae76c9a7fc94e600a48cd498e (diff) | |
| parent | 4261a5a1eac0692d9d6a488cc86047bd582145de (diff) | |
| download | gitlab-ce-06e98c0f9bdf73aa57a58587910236ca29dfd4e3.tar.gz | |
Merge pull request #4619 from thomasbiddle/merge_request_api
Adding links to the merge requests and group documentation.
| -rw-r--r-- | app/views/help/_api_layout.html.haml | 2 | ||||
| -rw-r--r-- | doc/api/README.md | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/help/_api_layout.html.haml b/app/views/help/_api_layout.html.haml index 2f649a509a5..87969be56da 100644 --- a/app/views/help/_api_layout.html.haml +++ b/app/views/help/_api_layout.html.haml @@ -5,7 +5,7 @@ Back to help %br %ul.nav.nav-pills.nav-stacked - - %w(README projects project_snippets repositories deploy_keys users session issues milestones notes system_hooks).each do |file| + - %w(README projects project_snippets repositories deploy_keys users groups session issues milestones merge_requests notes system_hooks).each do |file| %li{class: file == @category ? 'active' : nil} = link_to file.titleize, help_api_file_path(file) diff --git a/doc/api/README.md b/doc/api/README.md index 4bcd89949df..49bda6725e7 100644 --- a/doc/api/README.md +++ b/doc/api/README.md @@ -74,6 +74,7 @@ When listing resources you can pass the following parameters: + [Projects](projects.md) + [Project Snippets](project_snippets.md) + [Repositories](repositories.md) ++ [Merge Requests](merge_requests.md) + [Issues](issues.md) + [Milestones](milestones.md) + [Notes](notes.md) |