summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add 'New file' link to dropdown on project pagenew-file-linkDmitriy Zaporozhets2015-11-022-0/+5
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-0210-110/+200
|\
| * Merge branch 'backup-improvements' into 'master' Kamil Trzciński2015-11-026-92/+82
| |\
| | * Do no rely on basename of builds, uploadsbackup-improvementsJacob Vosmaer2015-10-163-6/+15
| | * One more backup spec fixJacob Vosmaer2015-10-061-0/+1
| | * Spec fixes for new backup contentsJacob Vosmaer2015-10-061-7/+7
| | * Remove superfluous mkdir -pJacob Vosmaer2015-10-061-2/+0
| | * Remove unused variableJacob Vosmaer2015-10-061-3/+2
| | * Keep old path: db/database.sql.gzJacob Vosmaer2015-10-062-3/+4
| | * Remove old "files" tarball explicitlyJacob Vosmaer2015-10-061-0/+1
| | * Reduce disk IO during SQL backupJacob Vosmaer2015-10-062-31/+26
| | * Use tar for intermediate backup storageJacob Vosmaer2015-10-064-59/+45
| * | 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 pull request #9794 from arnaud-zg/masterRobert Schilling2015-11-021-0/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Go to gitlab installation folder before initialize databasezheng_b2015-11-021-0/+4
* | | | | 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
|\ \ \ \ \ \
View Lorry Controller Status