summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix testsonly-syntaxKamil Trzcinski2015-11-031-15/+11
* SpellingKamil Trzcinski2015-11-021-1/+1
* Extend yml syntax for only and except to support specifying repository pathKamil Trzcinski2015-11-025-111/+273
* Merge branch 'rs-dev-issue-2613' into 'master' Douwe Maan2015-11-022-10/+110
|\
| * Add custom protocol whitelisting to SanitizationFilterrs-dev-issue-2613Robert Speicher2015-10-012-10/+110
* | Merge branch 'rs-editor-submit' into 'master' Douwe Maan2015-11-022-8/+8
|\ \
| * | Persist blob editor's value on submit, not on clickrs-editor-submitRobert Speicher2015-10-312-8/+8
* | | Merge branch 'doc-Gitlab-2-GitLab' into 'master' Achilleas Pipinellis2015-11-017-22/+21
|\ \ \
| * | | Gilab -> GitLabRobert Schilling2015-10-317-22/+21
* | | | Merge branch 'fix-doc-typo' into 'master' Achilleas Pipinellis2015-11-011-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in rake task docRobert Schilling2015-10-311-1/+1
| |/ /
* | | Merge branch 'fix-deadlink-in-docs-ci-examples' into 'master' Achilleas Pipinellis2015-10-311-3/+3
|\ \ \ | |/ / |/| |
| * | Fix deadlink in docs for ci/examplesTakuya Noguchi2015-10-311-3/+3
* | | Merge branch 'gitlab-workhorse' into 'master' Dmitriy Zaporozhets2015-10-308-65/+250
|\ \ \
| * | | Make sed command GNU-compatiblegitlab-workhorseJacob Vosmaer2015-10-291-1/+1
| * | | Add missing "cd"Jacob Vosmaer2015-10-291-0/+1
| * | | Switch to gitlab-workhorseJacob Vosmaer2015-10-298-65/+249
* | | | Merge branch 'optimize-user-find-by-any-email' into 'master' Yorick Peterse2015-10-303-15/+37
|\ \ \ \ | |_|/ / |/| | |
| * | | Adjusted ips/sec for find_by_any_email benchmarksoptimize-user-find-by-any-emailYorick Peterse2015-10-301-2/+2
| * | | Use a subquery with IDs only for find_by_any_emailYorick Peterse2015-10-301-9/+7
| * | | Fixed UNION syntax for MySQLYorick Peterse2015-10-301-2/+2
| * | | Use a UNION for User.find_by_any_emailYorick Peterse2015-10-301-3/+12
| * | | Changelog entry for User.find_by_any_emailYorick Peterse2015-10-301-0/+1
| * | | Improve performance of User.find_by_any_emailYorick Peterse2015-10-302-15/+29
* | | | Merge branch 'minor-ui-fixes' into 'master' Dmitriy Zaporozhets2015-10-303-8/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix label destroy jsminor-ui-fixesDmitriy Zaporozhets2015-10-291-1/+1
| * | | Fix bg for labels page when no labels presentDmitriy Zaporozhets2015-10-291-3/+3
| * | | Put delete snippet btn after edit btnDmitriy Zaporozhets2015-10-291-4/+4
* | | | Merge branch 'binford2k/gitlab-ce-feature/create_new_directories'Douwe Maan2015-10-298-5/+66
|\ \ \ \
| * | | | Update changelog itemDouwe Maan2015-10-291-3/+3
| * | | | Add ability to create directories in the editorBen Ford2015-10-298-5/+66
* | | | | Merge branch 'fix-issue-3138' into 'master' Douwe Maan2015-10-292-1/+2
|\ \ \ \ \
| * | | | | Force update refs/merge-requests/X/head upon a push to the source branch of a...Stan Hu2015-10-292-1/+2
* | | | | | Merge branch 'shared-file-access' into 'master' Dmitriy Zaporozhets2015-10-295-1/+43
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Clarify puppiesshared-file-accessJacob Vosmaer2015-10-261-2/+2
| * | | | | Start putting shared files in "shared"Jacob Vosmaer2015-10-265-1/+43
* | | | | | Write out internet explorerSytse Sijbrandij2015-10-291-1/+1
* | | | | | IE message doesn't need a headingSytse Sijbrandij2015-10-291-5/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'closing-issue-tracker' into 'master' Dmitriy Zaporozhets2015-10-281-0/+7
|\ \ \ \ \
| * | | | | Add copy paste text for closing down the Github issue trackerclosing-issue-trackerJeroen van Baarsen2015-10-281-0/+7
* | | | | | Merge branch 'edit-new-cross-references' into 'master' Dmitriy Zaporozhets2015-10-280-0/+0
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge branch 'rs-update-nprogress-rails' into 'master' Dmitriy Zaporozhets2015-10-282-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Bump nprogress-rails to 0.1.6.7rs-update-nprogress-railsRobert Speicher2015-10-262-3/+3
* | | | | | | | Merge branch 'edit-new-cross-references'Dmitriy Zaporozhets2015-10-284-3/+4
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Use issue editor as cross reference comment author when issue is edited with ...edit-new-cross-referencesDouwe Maan2015-10-284-3/+4
* | | | | | | | Merge branch 'cleanup-ci-integration' into 'master' Dmitriy Zaporozhets2015-10-288-83/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove deprecated CI events from project settings pageDmitriy Zaporozhets2015-10-288-83/+1
* | | | | | | | | Merge branch 'fix_permission_doc' into 'master' Achilleas Pipinellis2015-10-281-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fixed the permission docHannes Rosenögger2015-10-281-2/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'gitlab-shell-v2.6.6' into 'master' Dmitriy Zaporozhets2015-10-282-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |