summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix error thrown with missing note fragment in DOM32888-fix-error-after-missing-note-hash-fragment-in-domEric Eastwood2017-05-262-2/+45
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32888 Reproduction: 1. Visit /namespace/project/merge_requests/x/diffs#note_1234 1. When `#note_1234` isn't in the diff, an error is thrown
* Merge branch 'acet-fix-mr-widget-state' into 'master'Douwe Maan2017-05-232-10/+10
|\ | | | | | | | | | | | | Change order of if blocks to determine widget state properly. Closes #32550 See merge request !11668
| * MRWidget: Change order of if blocks to determine widget state properly.acet-fix-mr-widget-stateFatih Acet2017-05-242-10/+10
| |
* | Merge branch 'fix-notify-post-receive' into 'master'Stan Hu2017-05-233-89/+91
|\ \ | | | | | | | | | | | | Prevent errors from non-functional notify_post_receive endpoint See merge request !11509
| * | Prevent errors from non-functional notify_post_receive endpointfix-notify-post-receiveAlejandro Rodríguez2017-05-183-89/+91
| | |
* | | Update CHANGELOG.md for 9.2.1Clement Ho2017-05-233-8/+5
| | | | | | | | | [ci skip]
* | | Merge branch '32509-next-run-in-pipeline-schedules-shows-past-time' into ↵Kamil Trzciński2017-05-232-2/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Use #real_next_run in pipelines table Closes #32509 See merge request !11660
| * | Test for next_run_at in the view.32509-next-run-in-pipeline-schedules-shows-past-timeBryce Johnson2017-05-231-1/+2
| | |
| * | Use real_next_run in pipeline schedule table.Bryce Johnson2017-05-231-1/+1
| | |
* | | Merge branch 'update-doc-rm-shell-compile' into 'master'Stan Hu2017-05-231-1/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove `bin/comple` from gitlab-shell v5.0.2 deployment procedure. See merge request !11655
| * | | Remove `bin/comple` from gitlab-shell v5.0.2 deployment procedure.Jun Kuriyama2017-05-241-1/+0
| |/ /
* | | Merge branch '32735-fix-right-sidebar-coming-up-short' into 'master'Annabel Dunstone Gray2017-05-231-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix right-sidebar gap on mobile Closes #32735 See merge request !11625
| * | | Fix sidebar coming up short on mobile32735-fix-right-sidebar-coming-up-shortEric Eastwood2017-05-231-0/+4
| | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/32735
* | | | Merge branch 'issue_32225' into 'master'Robert Speicher2017-05-2313-52/+50
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add transient head_pipeline_of to pipeline factories See merge request !11566
| * | | | Add transient head_pipeline_of to pipeline factoriesissue_32225Felipe Artur2017-05-2213-52/+50
| | | | |
* | | | | Merge branch ↵Robert Speicher2017-05-232-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '29881-default-project-view-highlighted-tab-when-changing-settings' into 'master' Change ‘Project view’ label to ‘Project home page content’ Closes #29881 See merge request !11650
| * | | | | Change ‘Project view’ label to ‘Project home page content’29881-default-project-view-highlighted-tab-when-changing-settingsPedro Moreira da Silva2017-05-232-6/+6
| | | | | |
* | | | | | Merge branch 'zj-fix-pipeline-etag' into 'master'Kamil Trzciński2017-05-239-1/+104
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline etag Closes #32658 See merge request !11615
| * | | | | Add changelog entry for pipeline etag issueZ.J. van de Weg2017-05-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Test the ExpireJobCacheWorker and related changeszj-fix-pipeline-etagZ.J. van de Weg2017-05-225-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | These were untested by the cherry picked commit.
| * | | | | Add MISSING e-tag refresh of resource for Job, and Pipeline GraphKamil Trzcinski2017-05-223-0/+47
| | | | | |
| * | | | | Add Etag caching for Pipeline#Show actionZ.J. van de Weg2017-05-222-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a typo this was not actually the case. Now that is fixed and performance should improve because of this.
* | | | | | Merge branch 'add-unicode-trace-feature-test' into 'master'Kamil Trzciński2017-05-233-42/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add feature test with unicode trace See merge request !10736
| * | | | | | Add feature test with unicode traceadd-unicode-trace-feature-testShinya Maeda2017-05-233-42/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit 43e5bba774e9e383dd55c665e82f6fcfc4ebfc4f Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:28:44 2017 +0900 Add fix commit 09610eebdf22ad048812bb86022504b2ad917e19 Author: Shinya Maeda <gitlab.shinyamaeda@gmail.com> Date: Mon Apr 17 17:03:49 2017 +0900 Add trace test
* | | | | | | Merge branch 'winh-filters-dropdown-scroll' into 'master'Annabel Dunstone Gray2017-05-231-5/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make static filter entries scroll with dynamic ones See merge request !11640
| * | | | | | | Make static filter entries scroll with dynamic oneswinh-filters-dropdown-scrollwinh2017-05-231-5/+2
| | | | | | | |
* | | | | | | | Merge branch 'docs/rm-superpowers' into 'master'Sean Packham (GitLab)2017-05-231-8/+3
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Move docs 'superpowers' items to their respective sections See merge request !11646
| * | | | | | | Move docs 'superpowers' items to respective sectionsdocs/rm-superpowersAchilleas Pipinellis2017-05-231-8/+3
| | | | | | | |
* | | | | | | | Merge branch '32738-fix-project-title-ellipsis-doing-nothing' into 'master'Annabel Dunstone Gray2017-05-231-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix group/project name ellipsis button doing nothing Closes #32738 See merge request !11623
| * | | | | | | | Fix group/project name ellipsis button doing nothing32738-fix-project-title-ellipsis-doing-nothingEric Eastwood2017-05-221-3/+3
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32738
* | | | | | | | Merge branch '17489-hide-code-from-guests' into 'master'Douwe Maan2017-05-235-6/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide clone panel and file list when user is only a guest (with review comments addressed) Closes #30432, #3142, and #17489 See merge request !11631
| * \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Valery Sizov2017-05-231678-10777/+28447
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17489-hide-code-from-guests
| * | | | | | | | | Fix review comment17489-hide-code-from-guestsValery Sizov2017-05-231-15/+24
| | | | | | | | | |
| * | | | | | | | | Hide clone panel and file list when user is only a guestJames Clark2017-05-075-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#17489 Fix test finding two of the same element Capybara will raise an exception because it finds two elements that match .nav-links. This means this test would fail, even if the page meets the conditions for passing the test. Add more tests for guest access
* | | | | | | | | | Merge branch 'fix-backup-raketask' into 'master'Timothy Andrew2017-05-232-12/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing regex to backup manager Closes #32669 See merge request !11635
| * | | | | | | | | | Fix testsAchilleas Pipinellis2017-05-231-14/+15
| | | | | | | | | | |
| * | | | | | | | | | Fix rubocopfix-backup-raketaskAchilleas Pipinellis2017-05-231-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Add tests for removing old backups with the new timestampAchilleas Pipinellis2017-05-231-6/+13
| | | | | | | | | | |
| * | | | | | | | | | Add missing regex to backup managerAchilleas Pipinellis2017-05-231-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10901/diffs introduced a new naming scheme for backups, but the code which cleans up old backups wasn't updated accordingly. In order to maintain backward compatibility, we need to account for 3 naming schemes.
* | | | | | | | | | | Merge branch 'winh-frontend-user-cache' into 'master'Filipa Lacerda2017-05-235-14/+252
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce UsersCache for storing user entities in frontend See merge request !11404
| * | | | | | | | | | | Add frontend UsersCache class (!11404)winh-frontend-user-cachewinh2017-05-232-0/+164
| | | | | | | | | | | |
| * | | | | | | | | | | Extract Cache class from AjaxCachewinh2017-05-213-14/+88
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '32749-update-helm-chart-documentation' into 'master'Achilleas Pipinellis2017-05-233-2/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Helm Chart documentation See merge request !11624
| * | | | | | | | | | | Tweak noteJoshua Lambert2017-05-231-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Add a note for waiting for storage to provision32749-update-helm-chart-documentationJoshua Lambert2017-05-223-1/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'run-mysql-on-stable' into 'master'Rémy Coutable2017-05-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run MySQL tests on *-stable as well See merge request !11602
| * | | | | | | | | | | | Run MySQL tests on *-stable as wellrun-mysql-on-stableLin Jen-Shin2017-05-221-0/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/transient-service-template-spec' into 'master'Rémy Coutable2017-05-231-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix propagate service spec transient failure See merge request !11629
| * | | | | | | | | | | | | Fix propagate service spec transient failurefix/transient-service-template-specJames Lopez2017-05-231-4/+8
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'winh-recent-searches-service-spec' into 'master'Fatih Acet2017-05-231-22/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle Promise rejections in RecentSearchesService spec See merge request !11206