summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Point people to the issue tracker on GitLab.com to prevent duplication.point-to-gitlab-comSytse Sijbrandij2015-05-261-4/+2
* Merge branch 'fix-escape-key-in-zen-mode' into 'master'Robert Schilling2015-05-262-2/+3
|\
| * Fix Zen Mode not closing with ESC keyStan Hu2015-05-252-2/+3
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2627-81/+164
|\ \
| * \ Merge branch 'rs-link_to_label' into 'master'Dmitriy Zaporozhets2015-05-267-12/+110
| |\ \
| | * | Make the actual labels on Labels#index linksrs-link_to_labelRobert Speicher2015-05-211-1/+1
| | * | Add link_to_label helperRobert Speicher2015-05-217-11/+109
| * | | Merge branch 'rs-gems' into 'master'Dmitriy Zaporozhets2015-05-2616-45/+41
| |\ \ \
| | * | | Fix bin/rails binstubrs-gemsRobert Speicher2015-05-201-2/+3
| | * | | Update ffaker gemRobert Speicher2015-05-2014-34/+34
| | * | | Update spring, re-run binstubsRobert Speicher2015-05-204-14/+9
| * | | | Merge branch 'rs-issue-1690' into 'master'Dmitriy Zaporozhets2015-05-262-3/+10
| |\ \ \ \
| | * | | | Better handle label references that aren't actually referencesrs-issue-1690Robert Speicher2015-05-252-3/+10
| * | | | | Merge branch 'fix-fullscreen-preview-in-milestones' into 'master'Dmitriy Zaporozhets2015-05-262-21/+3
| |\ \ \ \ \
| | * | | | | Fix Markdown preview not working in Edit Milestone pageStan Hu2015-05-252-21/+3
| | | |_|_|/ | | |/| | |
* | | | | | Merge pull request #9320 from jvanbaarsen/wiki-extentionJeroen van Baarsen2015-05-262-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use .md as extention for wiki pagesJeroen van Baarsen2015-05-262-1/+2
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2634-131/+436
|\ \ \ \ \
| * \ \ \ \ Merge branch 'fix-milestone-browse-issues-permission-check' into 'master'Douwe Maan2015-05-264-6/+21
| |\ \ \ \ \
| | * | | | | Refactor permission checks to use `can?` instead of `issues_enabled` and `mer...Stan Hu2015-05-254-6/+21
| * | | | | | Merge branch 'get-monkey-off-my-rack-attack' into 'master'Douwe Maan2015-05-267-71/+5
| |\ \ \ \ \ \
| | * | | | | | Remove Rack Attack monkey patches and bump to version 4.3.0Stan Hu2015-05-227-71/+5
| * | | | | | | Merge branch 'master' into 'master'Job van der Voort2015-05-262-0/+23
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | fixed infoKaren2015-05-261-4/+2
| | * | | | | | fixed linkKaren2015-05-261-1/+1
| | * | | | | | added link to documentation style guideKaren2015-05-261-0/+1
| | * | | | | | removed unnecessary informationKaren2015-05-261-5/+0
| | * | | | | | fixed info boxKaren2015-05-261-2/+2
| | * | | | | | created a documentation style guideKaren2015-05-261-0/+29
| |/ / / / / /
| * | | | | | Update reason for the merge window.Sytse Sijbrandij2015-05-251-1/+3
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'rs-document-autolink' into 'master'Sytse Sijbrandij2015-05-251-6/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Document expanded autolinking in doc/markdown/markdown.mdRobert Speicher2015-05-251-6/+16
| |/ / / /
| * | | | Make clear that it are database migrationsSytse Sijbrandij2015-05-251-2/+2
| * | | | Merge branch 'disabled-issues-mr-features' into 'master'Douwe Maan2015-05-257-38/+49
| |\ \ \ \
| | * | | | Disable "New Issue" and "New Merge Request" buttons when features are disable...Stan Hu2015-05-257-38/+49
| * | | | | Let's start 7.12Robert Schilling2015-05-251-1/+1
| * | | | | Merge branch 'fix-redundant-changelog-entry' into 'master'Robert Schilling2015-05-251-1/+0
| |\ \ \ \ \
| | * | | | | This entry was already present in v7.10.4Stan Hu2015-05-221-1/+0
| * | | | | | Merge branch 'add-webhook-note-events' into 'master'Douwe Maan2015-05-2517-6/+317
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Add support for Webhook note eventsStan Hu2015-05-2117-6/+317
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'backup_gitlab.com' into 'master'Job van der Voort2015-05-261-0/+4
|\ \ \ \ \ \
| * | | | | | Explained info betterKaren Carias2015-05-261-1/+2
| * | | | | | Added note about backups for gitlab.comKaren Carias2015-05-211-0/+3
* | | | | | | Merge branch 'fix_timezonedoc' into 'master'Douwe Maan2015-05-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | small fixKaren Carias2015-05-251-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'keyboard_shortcuts' into 'master'Sytse Sijbrandij2015-05-223-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | fixed linkKaren Carias2015-05-221-1/+1
| * | | | | | Added link to keyboard shortcutsKaren Carias2015-05-221-0/+1
| * | | | | | test1 imageKaren Carias2015-05-221-1/+1
| * | | | | | keyboard shortcuts in GitLabKaren Carias2015-05-221-0/+5