summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clarify artifact expiryexpiryMark Pundsack2016-06-211-2/+2
* Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-216-11/+10
|\
| * Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-212-4/+2
| * Fixed notification testsPhil Hughes2016-06-211-2/+2
| * Fixed issue with notification dropdownn not updating activePhil Hughes2016-06-213-5/+6
* | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-215-42/+55
|\ \
| * | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-215-42/+55
* | | Merge branch 'blank-state' into 'master' Jacob Schatz2016-06-216-12/+51
|\ \ \
| * | | Tests updateblank-statePhil Hughes2016-06-212-4/+5
| * | | Moved new environment link to below blank state textPhil Hughes2016-06-212-4/+8
| * | | Updated blank state for environments and deploymentsPhil Hughes2016-06-215-9/+43
| | |/ | |/|
* | | Merge branch '18743-sidebar-pin-tooltip' into 'master' Jacob Schatz2016-06-213-12/+29
|\ \ \
| * | | Fix tooltip title and persist state18743-sidebar-pin-tooltipAlfredo Sumaran2016-06-211-13/+27
| * | | Update CHANGELOGAnnabel Dunstone2016-06-211-0/+1
| * | | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-212-1/+3
* | | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-219-20/+46
|\ \ \ \
| * | | | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-214-15/+9
| * | | | Add Changelog entry for builds API commit data fixGrzegorz Bizon2016-06-211-0/+1
| * | | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-215-13/+44
* | | | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-215-5/+23
|\ \ \ \ \
| * | | | | Show proper image ID on registry pageKamil Trzcinski2016-06-215-5/+23
* | | | | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-215-304/+274
|\ \ \ \ \ \
| * | | | | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-212-289/+242
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-21608-4171/+28415
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-10889-4516/+13105
| |\ \ \ \ \ \
| * | | | | | | WIPKamil Trzcinski2016-06-035-17/+34
* | | | | | | | Merge branch 'backport_from_ee' into 'master' Valery Sizov2016-06-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
* | | | | | | | | Merge branch '18792-cache-participants-call' into 'master' Yorick Peterse2016-06-213-0/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Cache Participable#participants in instance variablePaco Guzman2016-06-213-0/+21
* | | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2160-192/+766
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| * | | | | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| * | | | | | | | Add feature test for gitab CI dropdownAlfredo Sumaran2016-06-201-0/+30
| * | | | | | | | Incorporate reviewZ.J. van de Weg2016-06-208-17/+34
| * | | | | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-2024-19/+160
| * | | | | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-202-1/+2
| * | | | | | | | Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-205-2/+42
| * | | | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-208-80/+126
| * | | | | | | | Add first templates for gitlab-ci dropdownZ.J. van de Weg2016-06-2015-0/+256
| * | | | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-2012-143/+183
* | | | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-2125-129/+431
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Update wordings according to:Lin Jen-Shin2016-06-213-4/+4
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...feature/runner-lock-on-projectLin Jen-Shin2016-06-2010-14/+92
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/runner-lock-on-pr...Lin Jen-Shin2016-06-20223-825/+11032
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add index for ci_runners.locked, feedback:Lin Jen-Shin2016-06-202-1/+14
| * | | | | | | | | | Rename according to:Lin Jen-Shin2016-06-205-20/+20
| * | | | | | | | | | Use .has-tooltip as suggested at:Lin Jen-Shin2016-06-201-2/+1
| * | | | | | | | | | Test for enabling/disabling runners from admin runner pageLin Jen-Shin2016-06-172-2/+36
| * | | | | | | | | | Admin::RunnerProjectsController#index is not usedremove-admin-runner-projectsLin Jen-Shin2016-06-172-6/+1