| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Require the ruby racer only in production since installing it on dev ↵easy-dev-install | Sytse Sijbrandij | 2014-12-15 | 1 | -1/+1 |
| | | | | | machines can cause a lot of problems. Hat tip to Jeroen van Baarsen | ||||
| * | Update CHANGELOG with snippet validation change | Dmitriy Zaporozhets | 2014-12-12 | 1 | -1/+1 |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | Merge branch 'sanitize-snippet-file-name' into 'master' | Dmitriy Zaporozhets | 2014-12-12 | 4 | -6/+16 |
| |\ | | | | | | | | | | | | | | | Validate and sanitize snippet file name Fixes #1816 See merge request !1322 | ||||
| | * | Fix snippet factory | Dmitriy Zaporozhets | 2014-12-12 | 1 | -2/+6 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Sanitize snippet file name in raw headers | Dmitriy Zaporozhets | 2014-12-12 | 3 | -2/+6 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | Add strict validation to snippet file names | Dmitriy Zaporozhets | 2014-12-12 | 1 | -2/+4 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | Merge branch 'fix_shell_commands_in_shell_install' into 'master' | Jacob Vosmaer | 2014-12-12 | 1 | -4/+19 |
| |\ \ | |/ |/| | | | | | | | | | | | Fix shell commands in shell install Fixes #1610 See merge request !1320 | ||||
| | * | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Dropdown icon not clickable Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events) See merge request !1319 | ||||
| | * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Show files named diff Fixes #1749 See merge request !1318 | ||||
| | * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Add an extra reference to the 'shell commands' guide The 'shell commands' guide now also has tips on opening/reading files and handling paths. See merge request !1321 | ||||
| | * | | 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 |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | 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 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated doc/integration/twitter.md, fixed incorrect callback URL Fixed a typo in the Integration instructions for Twitter OAuth See merge request !257 | ||||
| | | * | | Example callback URL was incorrect | Scott Stamp | 2014-12-08 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | (referencing /users/auth/github/callback, not /users/auth/twitter/callback) | ||||
| * | | | 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 |
| | |\ \ | | |/ | |/| | Enable Markdown preview for issues, merge requests, milestones, and notes | ||||
| | | * | Merge branch 'upstream-master' into markdown-preview | Vinnie Okada | 2014-12-07 | 417 | -2204/+6299 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: spec/routing/project_routing_spec.rb | ||||
| | | * | | Fix test assertions | Vinnie Okada | 2014-10-21 | 4 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | Make sure we're asserting the correct thing when testing visible and invisible DOM elements. | ||||
| | | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | Add a test to make sure that Markdown previews are available when editing an existing issue. | ||||
| | | * | | Fix Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -36/+45 |
| | | | | | | | | | | | | | | | | | | | | | Update Spinach tests for Markdown previews for the new-ish tab UI that replaced the old preview/edit toggle button. | ||||
| | | * | | Refactor Markdown preview tests | Vinnie Okada | 2014-10-18 | 7 | -39/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Create a new shared module for common issue/merge request behavior, use `expect` syntax instead of `should`, and avoid `visible: false` in the `have_css` matcher. | ||||
| | | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes. | ||||
| * | | | | Merge branch 'doc/file_read' into 'master' | Sytse Sijbrandij | 2014-12-09 | 1 | -0/+63 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add security tips about file and paths These are some extra guidelines to guard against code execution and path traversal. See merge request !1317 | ||||
| | * | | | 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 from issue tracker guidelines Is this the preferred method of reproducing an issue? If yes, disregard this MR. \cc @sytses @marin See merge request !255 | ||||
| | | * | | 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 | ||||
| | | * | | 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 omniauth AddIdentityTable migration https://dev.gitlab.org/gitlab/gitlabhq/issues/1810 See merge request !1315 | ||||
| | * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Unicorn workers See merge request !1316 | ||||
| | * | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Unicorn advice See merge request !1314 | ||||
| | * | | | | 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 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'grace time' behavior to Sidekiq MemoryKiller The previous iteration of the memory killer did not give 'large' jobs much of a chance to finish. This caused them to come back after each restart, leading to another memory-induced shutdown. By adding some 'grace time' between the moment we detect a memory peak and the moment we start shutting down, we hope to give Sidekiq a chance to get whatever causes its memory to grow 'out of its system'. See merge request !1313 | ||||
| | * | | | Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable | Jacob Vosmaer | 2014-12-08 | 1 | -1/+1 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |