Commit 97163340 authored by Fatih Acet's avatar Fatih Acet

Merge branch '20101-ci-configuration' into 'master'

Resolve ""CI configuration" button when `.gitlab-ci.yml` is present"

## What does this MR do?
Adds `CI configuration` button to project overview page

## What are the relevant issue numbers?
Closes #20101

## Screenshots (if relevant)
![Screen_Shot_2016-07-28_at_11.51.32_AM](/uploads/499d942d203d287ae98b7589ef12673c/Screen_Shot_2016-07-28_at_11.51.32_AM.png)



See merge request !5558
parents b4b7adbe afca25ed
...@@ -41,6 +41,7 @@ v 8.11.0 (unreleased) ...@@ -41,6 +41,7 @@ v 8.11.0 (unreleased)
- Profile requests when a header is passed - Profile requests when a header is passed
- Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab. - Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab.
- Add commit stats in commit api. !5517 (dixpac) - Add commit stats in commit api. !5517 (dixpac)
- Add CI configuration button on project page
- Make error pages responsive (Takuya Noguchi) - Make error pages responsive (Takuya Noguchi)
- Change requests_profiles resource constraint to catch virtually any file - Change requests_profiles resource constraint to catch virtually any file
- Reduce number of queries made for merge_requests/:id/diffs - Reduce number of queries made for merge_requests/:id/diffs
......
...@@ -263,6 +263,10 @@ module ProjectsHelper ...@@ -263,6 +263,10 @@ module ProjectsHelper
filename_path(project, :version) filename_path(project, :version)
end end
def ci_configuration_path(project)
filename_path(project, :gitlab_ci_yml)
end
def project_wiki_path_with_version(proj, page, version, is_newest) def project_wiki_path_with_version(proj, page, version, is_newest)
url_params = is_newest ? {} : { version_id: version } url_params = is_newest ? {} : { version_id: version }
namespace_project_wiki_path(proj.namespace, proj, page, url_params) namespace_project_wiki_path(proj.namespace, proj, page, url_params)
......
...@@ -43,6 +43,10 @@ ...@@ -43,6 +43,10 @@
%li %li
= link_to 'Contribution guide', contribution_guide_path(@project) = link_to 'Contribution guide', contribution_guide_path(@project)
- if @repository.gitlab_ci_yml
%li
= link_to 'CI configuration', ci_configuration_path(@project)
- if current_user && can_push_branch?(@project, @project.default_branch) - if current_user && can_push_branch?(@project, @project.default_branch)
- unless @repository.changelog - unless @repository.changelog
%li.missing %li.missing
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment