delta/gitlab/gitlab-ce.git/app/controllers, branch zj-include-openshift gitlab.com: gitlab-org/gitlab-ce.git Merge branch '23449-cycle-analytics-2-frontend' into 'master' 2016-11-22T00:16:13+00:00 Jacob Schatz jschatz@gitlab.com 2016-11-22T00:16:13+00:00 d17f5068118a0c86fcd39b3576161b2408596e2d Cycle analytics second iteration frontend ## Are there points in the code the reviewer needs to double check? Mostly typos and code guidelines. ## Why was this MR needed? This implements the frontend part of !6859 for #23449 ## Screenshots **Initial view** ![Screen_Shot_2016-11-21_at_5.28.43_PM](/uploads/ff9cfa9c9d6c2da28c24e03e384f89af/Screen_Shot_2016-11-21_at_5.28.43_PM.png) **Cycle Analytics with data** ![Screen_Shot_2016-11-21_at_2.09.24_PM](/uploads/18d9786c090bdd554cf786c879543302/Screen_Shot_2016-11-21_at_2.09.24_PM.png) **User doesn't have access for a stage** ![Screen_Shot_2016-11-21_at_2.11.01_PM](/uploads/d1ea76a63f2de2224954b5f40038c488/Screen_Shot_2016-11-21_at_2.11.01_PM.png) ## 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 - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] 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) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23449 See merge request !7366 

Cycle analytics second iteration frontend

## Are there points in the code the reviewer needs to double check?
Mostly typos and code guidelines.

## Why was this MR needed?
This implements the frontend part of !6859 for #23449

## Screenshots

**Initial view**
![Screen_Shot_2016-11-21_at_5.28.43_PM](/uploads/ff9cfa9c9d6c2da28c24e03e384f89af/Screen_Shot_2016-11-21_at_5.28.43_PM.png)

**Cycle Analytics with data**
![Screen_Shot_2016-11-21_at_2.09.24_PM](/uploads/18d9786c090bdd554cf786c879543302/Screen_Shot_2016-11-21_at_2.09.24_PM.png)

**User doesn't have access for a stage**
![Screen_Shot_2016-11-21_at_2.11.01_PM](/uploads/d1ea76a63f2de2224954b5f40038c488/Screen_Shot_2016-11-21_at_2.11.01_PM.png)

## 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
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] 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)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

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

See merge request !7366
 Merge branch 'hide-empty-merge-request-diffs' into 'master' 2016-11-21T19:23:22+00:00 Sean McGivern sean@mcgivern.me.uk 2016-11-21T19:23:22+00:00 7a5e653fde62cfcd0e05be7954bbf14de0cb6d8c Fix errors happening when source branch of merge request is removed and then restored See merge request !7568 

Fix errors happening when source branch of merge request is removed and then restored

See merge request !7568
 Use stage description form endpoint response 2016-11-21T18:57:10+00:00 Alfredo Sumaran alfredo@gitlab.com 2016-11-16T21:11:27+00:00 2748a01a3a0dc6c6e946c41c68ec866bc87e8f8b 






Provide stage legend on server response
2016-11-21T18:57:09+00:00

Alfredo Sumaran
alfredo@gitlab.com

2016-11-16T18:57:32+00:00

06fd2879ee4f5936e0be9744cbd208079f2542bd












Hide box with CI status when there are no changes in merge request
2016-11-21T17:13:53+00:00

Adam Niedzielski
adamsunday@gmail.com

2016-11-21T14:27:32+00:00

35615bc33179a88c580cc28aca74c70754d21120












Return valid response in Projects::MergeRequestsController#ci_status when diff_head_sha is nil
2016-11-21T17:13:53+00:00

Adam Niedzielski
adamsunday@gmail.com

2016-11-21T14:21:18+00:00

aebca55d7ab25584872a9a0acbb3e4530759d31d












Updated code based on feedback
2016-11-21T16:29:07+00:00

James Lopez
james@jameslopez.es

2016-11-21T16:29:07+00:00

a3331eee91fdd2170865c37641a88af2b47f9839












rename method
2016-11-21T16:19:18+00:00

James Lopez
james@jameslopez.es

2016-11-21T14:45:15+00:00

7a63021ab3793ea64ead0d18cbd6ba1e62aa11bc












Adds a flag to reflect whether or not there is data in cycle analytics
2016-11-21T16:19:18+00:00

James Lopez
james@jameslopez.es

2016-11-21T14:39:43+00:00

dde8fba524aa071d08121818a1e2c3d635664819












Merge branch 'fix/cycle-analytics-permissions' into 'master'

2016-11-21T16:07:27+00:00

Sean McGivern
sean@mcgivern.me.uk

2016-11-21T16:07:27+00:00

80eaed1651e6a278af87e015f6b414d4f943a352


Added permissions per stage to cycle analytics endpoint

See merge request !7613





Added permissions per stage to cycle analytics endpoint

See merge request !7613