summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Enable caching of schema.rbschema-cacheYorick Peterse2017-08-246-4/+22
* use database_configuration in Database.configYorick Peterse2017-08-241-1/+1
* Merge branch 'fix-old-mr-diffs' into 'master'Douwe Maan2017-08-243-5/+70
|\
| * Show un-highlighted diffs when blobs are the sameSean McGivern2017-08-243-5/+54
| * Always return a simple diff viewerSean McGivern2017-08-222-0/+16
* | Merge branch 'archived-projects-only' into 'master'Douwe Maan2017-08-2410-31/+110
|\ \
| * | Add an option to list only archived projectsMehdi Lahmam2017-08-249-6/+57
| * | Refactor Admin::ProjectsFinder by extracting finders as private methodsMehdi Lahmam2017-08-242-26/+54
* | | Merge branch 'an-gitaly-ref-exists-extras' into 'master'Sean McGivern2017-08-247-7/+65
|\ \ \
| * | | Delegate Repository::branch_exists? and ref_exists? to Gitlab::GitAndrew Newdigate2017-08-247-7/+65
|/ / /
* | | Merge branch '36262_merge_request_reference_in_merge_commit_global' into 'mas...Sean McGivern2017-08-244-5/+9
|\ \ \
| * | | [ci skip] changelog entry added for full merge request ref changeshaseeb2017-08-232-1/+5
| * | | fixes failing tests for full reference changehaseeb2017-08-132-3/+3
| * | | fix Merge request reference in merge commit is not globalhaseeb2017-08-131-2/+2
* | | | Merge branch 'fix/gb/avoid-races-when-cleaning-db-in-tests' into 'master'Sean McGivern2017-08-241-3/+3
|\ \ \ \
| * | | | Invalidate cache before cleaning db in tests after contextfix/gb/avoid-races-when-cleaning-db-in-testsGrzegorz Bizon2017-08-231-3/+3
* | | | | Merge branch 'zj-add-pipeline-source-variable' into 'master'Grzegorz Bizon2017-08-244-2/+21
|\ \ \ \ \
| * | | | | Expose CI_PIPELINE_SOURCE on CI jobsZeger-Jan van de Weg2017-08-234-2/+21
* | | | | | Merge branch 'sh-fix-branch-count' into 'master'Douwe Maan2017-08-242-1/+31
|\ \ \ \ \ \
| * | | | | | Fix inconsistent number of branches when remote branches are presentsh-fix-branch-countStan Hu2017-08-232-1/+31
* | | | | | | Merge branch 'use_full_path_in_project_avatar_url_webhook' into 'master'Robert Speicher2017-08-232-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Use full path of project's avatar in webhooksblackst0ne2017-08-182-1/+6
* | | | | | | | Merge branch 'dm-ldap-adapter-attributes' into 'master'Robert Speicher2017-08-234-8/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Support simple string LDAP attribute specifications, and search for name rath...dm-ldap-adapter-attributesDouwe Maan2017-08-234-8/+19
* | | | | | | | | Merge branch '36709-gpg-status' into 'master'Clement Ho2017-08-233-6/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Fix alignment of gpg status36709-gpg-statusAnnabel Dunstone Gray2017-08-233-6/+7
* | | | | | | | | Merge branch 'zj-fix-fe-blank-button' into 'master'Clement Ho2017-08-232-1/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix blank button not resetting project template valueZeger-Jan van de Weg2017-08-232-1/+6
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '36883-update-license-approval-process' into 'master'Douwe Maan2017-08-231-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update licensing query guidelinesNick Thomas2017-08-231-1/+1
* | | | | | | | | | Merge branch 'fix/gitlay-raw-blame-request-encoding' into 'master'Robert Speicher2017-08-231-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Properly encode Gitaly RawBlame request paramsfix/gitlay-raw-blame-request-encodingAhmad Sherif2017-08-231-2/+2
| |/ / / / / / / /
* | | | | | | | | Merge branch 'cache-issue-and-mr-counts' into 'master'Douwe Maan2017-08-2325-71/+301
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache the number of open issues and merge requestsYorick Peterse2017-08-2325-71/+301
* | | | | | | | | | Merge branch 'bvl-improve-bare-project-import' into 'master'Sean McGivern2017-08-238-81/+272
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix error when importing a GitHub-wiki repositorybvl-improve-bare-project-importBob Van Landuyt2017-08-231-1/+1
| * | | | | | | | | Migrate creation of nested groups into a serviceBob Van Landuyt2017-08-235-70/+101
| * | | | | | | | | Improve bare repository importBob Van Landuyt2017-08-234-63/+223
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Update CHANGELOG.md for 9.5.1Simon Knox2017-08-236-23/+8
* | | | | | | | | Merge branch '36806-update-rbnacl' into 'master'Douwe Maan2017-08-232-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Update the rbnacl gem to 4.0.2Nick Thomas2017-08-222-4/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'gitaly-commit-patch' into 'master'Sean McGivern2017-08-235-4/+45
|\ \ \ \ \ \ \ \
| * | | | | | | | Incorporate DiffService.CommitPatch Gitaly RPCgitaly-commit-patchAlejandro Rodríguez2017-08-226-5/+46
* | | | | | | | | Merge branch 'remove-tooltip-filtered-search-user' into 'master'Tim Zallmann2017-08-233-9/+46
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove tooltip from filtered search userremove-tooltip-filtered-search-userClement Ho2017-08-223-9/+46
* | | | | | | | | | Merge branch 'fix-push-events-branch-removals' into 'master'Sean McGivern2017-08-237-11/+62
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix display of push events for removed refsfix-push-events-branch-removalsYorick Peterse2017-08-227-11/+62
* | | | | | | | | | | Merge branch 'tc-remove-nonexisting-namespace-pending-delete-projects' into '...Douwe Maan2017-08-235-1/+107
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use EachBatch concern to loop over batchestc-remove-nonexisting-namespace-pending-delete-projectsToon Claes2017-08-222-26/+22
| * | | | | | | | | | | Migration to remove pending delete projects with non-existing namespaceToon Claes2017-08-225-1/+111
| | |_|_|/ / / / / / / | |/| | | | | | | | |