summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update Autolink SCHEME_PATTERNRobert Speicher2015-04-301-1/+3
* Doc typoRobert Speicher2015-04-301-1/+1
* Fix header_should_have_correct_id_and_link for featuresRobert Speicher2015-04-301-2/+6
* More gitlab_markdown_helper_spec cleanupRobert Speicher2015-04-301-56/+1
* Escape normal text in our Redcarpet rendererRobert Speicher2015-04-301-1/+3
* Update the Gitlab::Markdown docsRobert Speicher2015-04-301-25/+1
* Add Gitlab::Markdown::SanitizationFilterRobert Speicher2015-04-305-65/+123
* Add Gitlab::Markdown::AutolinkFilterRobert Speicher2015-04-305-17/+202
* Fix header styles for anchors generated by TableOfContentsFilterRobert Speicher2015-04-301-1/+6
* Add Gitlab::Markdown::TableOfContentsFilterRobert Speicher2015-04-306-28/+168
* Add a feature spec for our entire Markdown parsing stackRobert Speicher2015-04-302-0/+572
* Merge branch 'fix-project-tags' into 'master'Douwe Maan2015-04-308-2/+76
|\
| * Fix DB error when trying to tag a repositoryStan Hu2015-04-278-3/+76
* | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-306-10/+49
|\ \
| * | Show incompatible projects in Google Code import statusStan Hu2015-04-306-10/+49
* | | Merge branch 'fix-submodule-error-with-forked-project' into 'master'Dmitriy Zaporozhets2015-04-307-12/+80
|\ \ \
| * | | Fix "Revspec not found" errors when viewing diffs in a forked project with su...Stan Hu2015-04-277-12/+80
* | | | Merge branch 'Soullivaneuh-show-aside'Dmitriy Zaporozhets2015-04-3010-19/+22
|\ \ \ \
| * \ \ \ Merge branch 'show-aside' of https://github.com/Soullivaneuh/gitlabhq into So...Dmitriy Zaporozhets2015-04-3010-19/+22
| |\ \ \ \ |/ / / / /
| * | | | Fix wrong placement of show-aside linkSullivan SENECHAL2015-04-2710-19/+22
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-308-7/+73
|\ \ \ \ \
| * \ \ \ \ Merge branch 'wip-means-no-mr' into 'master'Dmitriy Zaporozhets2015-04-308-7/+73
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-308-7/+73
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-301-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge pull request #9232 from jverdeyen/hotfix/upgrade_docs_typoJeroen van Baarsen2015-04-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update 7.9-to-7.10.mdJoeri Verdeyen2015-04-301-2/+2
| |/ / / /
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-04-3022-282/+243
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'search-layout' into 'master'Dmitriy Zaporozhets2015-04-2916-133/+161
| |\ \ \ \
| | * | | | Fix testsDmitriy Zaporozhets2015-04-291-1/+1
| | * | | | Move search categories (projects, issues etc) below search field. Instead use...Dmitriy Zaporozhets2015-04-298-81/+87
| | * | | | Continue refactoring and restyle of search layoutDmitriy Zaporozhets2015-04-2810-70/+98
| | * | | | Draft improvements to search layoutDmitriy Zaporozhets2015-04-2811-115/+109
| * | | | | Fix visibility settings UI in admin areaDmitriy Zaporozhets2015-04-291-2/+2
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-04-295-148/+80
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'footnotes-markdown' into 'master'Douwe Maan2015-04-292-1/+3
| | |\ \ \ \ \
| | | * | | | | Add footnotes support to MarkdownGuillaume Delbergue2015-04-242-1/+3
| | * | | | | | Merge branch 'refactor-service-settings' into 'master'Douwe Maan2015-04-293-147/+77
| | |\ \ \ \ \ \
| | | * | | | | | Move service template and project service settings into a shared viewStan Hu2015-04-293-147/+77
| | |/ / / / / /
| * | | | | | | Merge branch 'Add_phrase_close_multiple_issues' into 'master'Sytse Sijbrandij2015-04-291-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Added phrase "Here's how to close multiple issues in one commit message" so t...Karen Carias2015-04-281-1/+3
* | | | | | | | Merge branch 'Soullivaneuh-container-class-reloaded'Dmitriy Zaporozhets2015-04-306-80/+73
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'container-class-reloaded' of https://github.com/Soullivaneuh/gi...Dmitriy Zaporozhets2015-04-306-80/+73
| |\ \ \ \ \ \ \ |/ / / / / / / /
| * | | | | | | Fix .container position on navbar (reloaded)Sullivan SENECHAL2015-04-296-80/+73
* | | | | | | | Merge branch 'fix_data' into 'master'Dmitriy Zaporozhets2015-04-292-1/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove abandoned GroupMembersValery Sizov2015-04-292-1/+7
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-04-292-2/+2
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #9220 from kylekatarnls/patch-1Jeroen van Baarsen2015-04-291-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix #9219 Affix menu size changeKyle2015-04-291-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #8677 from jubianchi/api-500-jsonJeroen van Baarsen2015-04-281-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Send 500 errors as JSON in the APIjubianchi2015-04-271-1/+1