summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Require the ruby racer only in production since installing it on dev machines...easy-dev-installSytse Sijbrandij2014-12-151-1/+1
* Update CHANGELOG with snippet validation changeDmitriy Zaporozhets2014-12-121-1/+1
* Merge branch 'sanitize-snippet-file-name' into 'master'Dmitriy Zaporozhets2014-12-124-6/+16
|\
| * Fix snippet factoryDmitriy Zaporozhets2014-12-121-2/+6
| * Sanitize snippet file name in raw headersDmitriy Zaporozhets2014-12-123-2/+6
| * Add strict validation to snippet file namesDmitriy Zaporozhets2014-12-121-2/+4
* | Merge branch 'fix_shell_commands_in_shell_install' into 'master'Jacob Vosmaer2014-12-121-4/+19
|\ \ | |/ |/|
| * Don't forget to splat.Marin Jankovski2014-12-121-4/+4
| * Use system where only return result is needed.Marin Jankovski2014-12-121-8/+7
| * Use shell invocation according to the shell commands guidelines.Marin Jankovski2014-12-111-4/+20
* | Merge branch 'dropdown_icon_not_clickable' into 'master'Dmitriy Zaporozhets2014-12-111-0/+1
|\ \
| * | Markdown dropzone image icon should not be clickable.Marin Jankovski2014-12-101-0/+1
| |/
* | Merge branch 'show_files_with_diff_name' into 'master'Dmitriy Zaporozhets2014-12-112-1/+2
|\ \
| * | Do not check for format on blob diff path.Marin Jankovski2014-12-101-1/+1
| * | Add a failing route spec for file named diff.Marin Jankovski2014-12-101-0/+1
| |/
* | Merge branch 'contributing-md-file-read' into 'master'Sytse Sijbrandij2014-12-111-0/+1
|\ \
| * | The 'shell commands' guide also covers files/pathsJacob Vosmaer2014-12-111-0/+1
|/ /
* | Update CHANGELOGDmitriy Zaporozhets2014-12-111-1/+1
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-12-111-1/+1
|\ \
| * \ Merge branch 'master' into 'master'Drew Blessing2014-12-081-1/+1
| |\ \
| | * | Example callback URL was incorrectScott Stamp2014-12-081-1/+1
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-12-1125-161/+316
|\ \ \ | |_|/ |/| |
| * | Merge pull request #8052 from mr-vinn/markdown-previewDmitriy Zaporozhets2014-12-1125-161/+316
| |\ \ | | |/ | |/|
| | * Merge branch 'upstream-master' into markdown-previewVinnie Okada2014-12-07417-2204/+6299
| | |\
| | * | Fix test assertionsVinnie Okada2014-10-214-15/+15
| | * | Fix more Markdown preview testsVinnie Okada2014-10-182-4/+5
| | * | Fix houndci warningsVinnie Okada2014-10-184-10/+10
| | * | Fix long line in viewVinnie Okada2014-10-181-1/+2
| | * | Add new Markdown preview testVinnie Okada2014-10-181-0/+7
| | * | Fix Markdown preview testsVinnie Okada2014-10-187-36/+45
| | * | Refactor Markdown preview testsVinnie Okada2014-10-187-39/+57
| | * | Use GET instead of POST for Markdown previewsVinnie Okada2014-10-163-4/+4
| | * | Add Markdown preview to more formsVinnie Okada2014-10-1521-141/+260
* | | | Merge branch 'doc/file_read' into 'master'Sytse Sijbrandij2014-12-091-0/+63
|\ \ \ \ | |/ / / |/| | |
| * | | Add security tips about file and pathsJacob Vosmaer2014-12-091-0/+63
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-12-081-1/+1
|\ \ \
| * \ \ Merge branch 'tracker_guidelines' into 'master'Sytse Sijbrandij2014-12-081-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Drop vagrant preference in issue tracker guidelines.Achilleas Pipinellis2014-12-081-1/+1
| |/ /
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-12-081-0/+0
|\ \ \
| * \ \ Merge pull request #8436 from Razer6/move_doc_to_folderJacob Vosmaer2014-12-081-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | Move sidekiq debug docs to development folderRobert Schilling2014-12-071-0/+0
* | | | Merge branch 'speed_up_migration' into 'master'Dmitriy Zaporozhets2014-12-081-9/+15
|\ \ \ \
| * | | | speed up migration to identitiesValery Sizov2014-12-081-9/+15
| |/ / /
* | | | Merge branch 'unicorn-workers' into 'master'Job van der Voort2014-12-081-23/+22
|\ \ \ \
| * | | | Consolidate unicorn worker advise.Sytse Sijbrandij2014-12-081-23/+22
|/ / / /
* | | | Merge branch 'unicorn-advice' into 'master'Sytse Sijbrandij2014-12-082-8/+18
|\ \ \ \
| * | | | memory constrained unicorn workersJob van der Voort2014-12-082-5/+5
| * | | | advise about unicorn workersJob van der Voort2014-12-082-8/+18
| |/ / /
* | | | Merge branch 'sidekiq_memory_killer_grace_time' into 'master'Dmitriy Zaporozhets2014-12-082-25/+30
|\ \ \ \ | |/ / / |/| | |
| * | | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variableJacob Vosmaer2014-12-081-1/+1