Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge branch 'sanitize-snippet-file-name' into 'master' | Dmitriy Zaporozhets | 2014-12-12 | 4 | -6/+16 | |
|\ \ \ \ | ||||||
| * | | | | Fix snippet factory | Dmitriy Zaporozhets | 2014-12-12 | 1 | -2/+6 | |
| * | | | | Sanitize snippet file name in raw headers | Dmitriy Zaporozhets | 2014-12-12 | 3 | -2/+6 | |
| * | | | | Add strict validation to snippet file names | Dmitriy Zaporozhets | 2014-12-12 | 1 | -2/+4 | |
* | | | | | Merge branch 'fix_shell_commands_in_shell_install' into 'master' | Jacob Vosmaer | 2014-12-12 | 1 | -4/+19 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Don't forget to splat. | Marin Jankovski | 2014-12-12 | 1 | -4/+4 | |
| * | | | | Use system where only return result is needed. | Marin Jankovski | 2014-12-12 | 1 | -8/+7 | |
| * | | | | Use shell invocation according to the shell commands guidelines. | Marin Jankovski | 2014-12-11 | 1 | -4/+20 | |
* | | | | | Merge branch 'dropdown_icon_not_clickable' into 'master' | Dmitriy Zaporozhets | 2014-12-11 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Markdown dropzone image icon should not be clickable. | Marin Jankovski | 2014-12-10 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'show_files_with_diff_name' into 'master' | Dmitriy Zaporozhets | 2014-12-11 | 2 | -1/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Do not check for format on blob diff path. | Marin Jankovski | 2014-12-10 | 1 | -1/+1 | |
| * | | | | | Add a failing route spec for file named diff. | Marin Jankovski | 2014-12-10 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'contributing-md-file-read' into 'master' | Sytse Sijbrandij | 2014-12-11 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | The 'shell commands' guide also covers files/paths | Jacob Vosmaer | 2014-12-11 | 1 | -0/+1 | |
|/ / / / / | ||||||
* | | | | | Update CHANGELOG | Dmitriy Zaporozhets | 2014-12-11 | 1 | -1/+1 | |
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-12-11 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'master' into 'master' | Drew Blessing | 2014-12-08 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Example callback URL was incorrect | Scott Stamp | 2014-12-08 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-12-11 | 25 | -161/+316 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Merge pull request #8052 from mr-vinn/markdown-preview | Dmitriy Zaporozhets | 2014-12-11 | 25 | -161/+316 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Merge branch 'upstream-master' into markdown-preview | Vinnie Okada | 2014-12-07 | 417 | -2204/+6299 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Fix test assertions | Vinnie Okada | 2014-10-21 | 4 | -15/+15 | |
| | * | | | | | Fix more Markdown preview tests | Vinnie Okada | 2014-10-18 | 2 | -4/+5 | |
| | * | | | | | Fix houndci warnings | Vinnie Okada | 2014-10-18 | 4 | -10/+10 | |
| | * | | | | | Fix long line in view | Vinnie Okada | 2014-10-18 | 1 | -1/+2 | |
| | * | | | | | Add new Markdown preview test | Vinnie Okada | 2014-10-18 | 1 | -0/+7 | |
| | * | | | | | Fix Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -36/+45 | |
| | * | | | | | Refactor Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -39/+57 | |
| | * | | | | | Use GET instead of POST for Markdown previews | Vinnie Okada | 2014-10-16 | 3 | -4/+4 | |
| | * | | | | | Add Markdown preview to more forms | Vinnie Okada | 2014-10-15 | 21 | -141/+260 | |
* | | | | | | | Merge branch 'doc/file_read' into 'master' | Sytse Sijbrandij | 2014-12-09 | 1 | -0/+63 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Add security tips about file and paths | Jacob Vosmaer | 2014-12-09 | 1 | -0/+63 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-12-08 | 1 | -1/+1 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'tracker_guidelines' into 'master' | Sytse Sijbrandij | 2014-12-08 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||||
| | * | | | | | Drop vagrant preference in issue tracker guidelines. | Achilleas Pipinellis | 2014-12-08 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-12-08 | 1 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #8436 from Razer6/move_doc_to_folder | Jacob Vosmaer | 2014-12-08 | 1 | -0/+0 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| | * | | | | | Move sidekiq debug docs to development folder | Robert Schilling | 2014-12-07 | 1 | -0/+0 | |
* | | | | | | | Merge branch 'speed_up_migration' into 'master' | Dmitriy Zaporozhets | 2014-12-08 | 1 | -9/+15 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | speed up migration to identities | Valery Sizov | 2014-12-08 | 1 | -9/+15 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'unicorn-workers' into 'master' | Job van der Voort | 2014-12-08 | 1 | -23/+22 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Consolidate unicorn worker advise. | Sytse Sijbrandij | 2014-12-08 | 1 | -23/+22 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'unicorn-advice' into 'master' | Sytse Sijbrandij | 2014-12-08 | 2 | -8/+18 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | memory constrained unicorn workers | Job van der Voort | 2014-12-08 | 2 | -5/+5 | |
| * | | | | | | | advise about unicorn workers | Job van der Voort | 2014-12-08 | 2 | -8/+18 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge branch 'sidekiq_memory_killer_grace_time' into 'master' | Dmitriy Zaporozhets | 2014-12-08 | 2 | -25/+30 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 | |
| * | | | | | | Fix typo | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 | |
| * | | | | | | Use constants instead of getters | Jacob Vosmaer | 2014-12-08 | 1 | -26/+13 |