summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add vs heading in perforce docdocs/migrating-from-perforceAchilleas Pipinellis2017-08-301-0/+2
* Add perforce migration docAchilleas Pipinellis2017-08-292-0/+49
* Merge branch '37102-fix-prometheus-graph-cursor-flag' into 'master'Phil Hughes2017-08-291-8/+8
|\
| * ensure graph overlay is in front of cursor flag37102-fix-prometheus-graph-cursor-flagMike Greiling2017-08-281-8/+8
* | Merge branch '37104-fix-graph-date-format' into 'master'Phil Hughes2017-08-296-15/+27
|\ \
| * | Resolve "Monitoring graph date formatting is wrong"Mike Greiling2017-08-296-15/+27
|/ /
* | Merge branch '36114-stuck-mrs-job-follow-up' into 'master'Sean McGivern2017-08-2910-41/+75
|\ \
| * | Cleans merge_jid when possible on MergeService36114-stuck-mrs-job-follow-upOswaldo Ferreira2017-08-282-8/+34
| * | Rename MergeRequest#async_merge to merge_asyncOswaldo Ferreira2017-08-285-7/+7
| * | Add changelogOswaldo Ferreira2017-08-283-12/+5
| * | Track enqueued and ongoing MRsOswaldo Ferreira2017-08-288-29/+44
| * | Remove locked? check when unlocking a merge requestOswaldo Ferreira2017-08-281-1/+1
* | | Merge branch 'short-code' into 'master'Phil Hughes2017-08-291-0/+24
|\ \ \
| * | | Add styles for shorter codeJacob Schatz2017-08-291-0/+24
|/ / /
* | | Merge branch '34413-move-convdev-index-location-to-after-cohorts' into 'master'Phil Hughes2017-08-294-8/+12
|\ \ \
| * | | Move ConvDev index to Overview from Monitoring.34413-move-convdev-index-location-to-after-cohortsBryce Johnson2017-08-184-8/+12
* | | | Merge branch 'rs-update-rubocop-gitlab-security' into 'master'Douwe Maan2017-08-294-5/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Update rubocop-gitlab-security to 0.1.0rs-update-rubocop-gitlab-securityRobert Speicher2017-08-284-5/+9
* | | | Merge branch '36582-fix-note-resolved-icon' into 'master'evn-fix-formatting-of-claFatih Acet2017-08-286-6/+25
|\ \ \ \
| * | | | Update and fix resolvable note icons for easier recognition36582-fix-note-resolved-iconEric Eastwood2017-08-256-6/+25
* | | | | Merge branch 'zj-update-templates-with-warning-header' into 'master'Stan Hu2017-08-283-0/+0
|\ \ \ \ \
| * | | | | Update templates to include header in the READMEZeger-Jan van de Weg2017-08-233-0/+0
* | | | | | Update CHANGELOG.md for 9.5.2Jose Ivan Vargas2017-08-287-32/+9
* | | | | | Merge branch 'rs-transient-mini-pipeline-graph-failure' into 'master'Douwe Maan2017-08-281-14/+4
|\ \ \ \ \ \
| * | | | | | Fix a transient failure in mini_pipeline_graph_specrs-transient-mini-pipeline-graph-failureRobert Speicher2017-08-281-14/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'group-mr-search-bar' into 'master'Clement Ho2017-08-284-3/+27
|\ \ \ \ \ \
| * | | | | | Add changelog entryHiroyuki Sato2017-08-281-0/+5
| * | | | | | Add a simple spec that checks filtered search works at group merge request pageHiroyuki Sato2017-08-271-0/+15
| * | | | | | Add filtered search to group merge requests dashboardHiroyuki Sato2017-08-192-3/+7
* | | | | | | Merge branch 'sh-add-spec-to-protected-tags-deletion' into 'master'Robert Speicher2017-08-281-0/+17
|\ \ \ \ \ \ \
| * | | | | | | Add spec for deleting protected tagssh-add-spec-to-protected-tags-deletionStan Hu2017-08-201-0/+17
| |/ / / / / /
* | | | | | | Merge branch 'fix/import-events' into 'master'Sean McGivern2017-08-284-1/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fix typoJames Lopez2017-08-281-1/+1
| * | | | | | fix specJames Lopez2017-08-282-1/+6
| * | | | | | Fix events error importing GitLab projectsJames Lopez2017-08-282-0/+9
* | | | | | | Merge branch 'sh-improve-flaky-ace-editor-spec' into 'master'Robert Speicher2017-08-281-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Improve flaky ACE editor specsh-improve-flaky-ace-editor-specStan Hu2017-08-261-2/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-flakes' into 'master'Robert Speicher2017-08-283-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix transient test failures caused by wrong dropdown triggerfix-flakesSimon Knox2017-08-283-3/+3
* | | | | | | | Merge branch '36061-mr-ref' into 'master'Sean McGivern2017-08-282-0/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Instrument MergeRequest#ensure_ref_fetched36061-mr-refJarka Kadlecova2017-08-282-0/+8
* | | | | | | | Merge branch 'mk-reenable-mysql-tests-on-all-branches' into 'master'Douwe Maan2017-08-282-19/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Reenable MySQL tests on all branchesmk-reenable-mysql-tests-on-all-branchesMichael Kozono2017-08-252-19/+1
* | | | | | | | | Merge branch '36792-inline-user-refresh-when-creating-project' into 'master'Douwe Maan2017-08-288-15/+107
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't treat gitlab project imports specially in Projects::CreateServiceNick Thomas2017-08-251-4/+2
| * | | | | | | | | Don't add admins as masters to projects created in another user's namespaceNick Thomas2017-08-252-3/+2
| * | | | | | | | | Move sidekiq-based project authorization refresh out of Projects::CreateServiceNick Thomas2017-08-257-12/+107
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'rs-aggregate-system-note-specs' into 'master'Douwe Maan2017-08-281-25/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Combine multiple expectations into one for shared system note examplers-aggregate-system-note-specsRobert Speicher2017-08-241-25/+4
| |/ / / / / / / /
* | | | | | | | | Merge branch 'fix/gb/clear-schema-cache-after-running-migration-tests' into '...Sean McGivern2017-08-281-0/+2
|\ \ \ \ \ \ \ \ \