summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2016-12-20 21:21:52 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2016-12-20 21:21:52 +0000
commit92a91a880327877fe3ac1825a4c5b638333cf586 (patch)
tree5d892cda3cd9c43af94d9109345cddbf3ee27c9d /config
parentd814533f690b4dba7d32006a97f2f696161fa564 (diff)
parent2b486c2bb27087e4eb306821b9fca95ff8ac74d3 (diff)
downloadgitlab-ce-92a91a880327877fe3ac1825a4c5b638333cf586.tar.gz
Merge branch '19703-direct-link-pipelines' into 'master'
Resolve "Direct link from pipeline list to builds" ## What does this MR do? - Adds a dropdown with builds in the mini pipeline graph in the pipelines table - Unnest a lot of CSS related with pipelines in order to make it reusable ## Screenshots ![Screen_Shot_2016-12-15_at_14.45.41](/uploads/ca1c61842a422a34383e029d668034b7/Screen_Shot_2016-12-15_at_14.45.41.png) ![Screen_Shot_2016-12-15_at_14.45.49](/uploads/952e3277143639ce4ad111103034faeb/Screen_Shot_2016-12-15_at_14.45.49.png) ![Screen_Shot_2016-12-15_at_14.46.02](/uploads/f7369a124b1c3c0db4194de2cb637ef0/Screen_Shot_2016-12-15_at_14.46.02.png) ![graph_animation](/uploads/9bae036cb5acff499f992a4722943d72/graph_animation.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25071 Closes #19703 See merge request !8097
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 80cc47ab9a8..335fccb617b 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -139,6 +139,7 @@ constraints(ProjectUrlConstrainer.new) do
end
member do
+ get :stage
post :cancel
post :retry
get :builds