summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rs-fix-highlighting' into 'master'Douwe Maan2015-09-111-4/+8
|\
| * RU-BO-COOOOOOOOPrs-fix-highlightingRobert Speicher2015-09-101-1/+1
| * Prevent result of SyntaxHighlightFilter being sanitizedRobert Speicher2015-09-101-4/+8
* | Add comments and clean up test for !1274Stan Hu2015-09-101-0/+2
|/
* Merge branch 'rescue-syntax-highlighting-errors' into 'master'Robert Schilling2015-09-101-1/+5
|\
| * Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-1/+5
* | Added service API endpoint to retrieve service parametersPetheo Bence2015-09-102-0/+19
|/
* Merge branch 'fix-emojis-relative-url' into 'master'Douwe Maan2015-09-091-1/+1
|\
| * Fix emoji URLs in Markdown when relative_url_root is usedStan Hu2015-09-061-1/+1
* | Merge branch 'nginx-git-http' into 'master'Dmitriy Zaporozhets2015-09-092-0/+18
|\ \
| * | The good stuff needs NGINX 1.7.11nginx-git-httpJacob Vosmaer2015-09-072-6/+10
| * | Do not let NGINX buffer Git HTTP requestsJacob Vosmaer2015-09-072-0/+14
* | | FogBugz project importJared Szechy2015-09-085-0/+424
|/ /
* | Merge branch 'url-builder-fix-for-relative-urls' into 'master'Dmitriy Zaporozhets2015-09-071-6/+2
|\ \
| * | Fix URL construction for merge requests, issues, notes, and commits for relat...Stan Hu2015-09-041-6/+2
| |/
* | Merge branch 'upgrade-redis-required-check' into 'master'Marin Jankovski2015-09-071-3/+6
|\ \
| * | Upgrade Redis requirement check to 2.4.0 per https://github.com/mperham/sidek...Stan Hu2015-09-061-4/+7
| |/
* | Use File.join to prevent extra slash in help message from appearing. Before:Stan Hu2015-09-061-2/+2
|/
* Fix `rake services:doc` generationStan Hu2015-09-031-3/+3
* Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-033-0/+25
* Merge branch 'grack-auth-new-instance' into 'master'Dmitriy Zaporozhets2015-09-021-0/+8
|\
| * Avoid instance variable re-use troubleJacob Vosmaer2015-09-021-0/+8
* | Drone CI serviceKirilll Zaitsev2015-09-024-65/+161
|/
* Merge branch 'use_db_for_application_settings' into 'master'Marin Jankovski2015-09-011-1/+13
|\
| * Added USE_DB env var to allow loading fake settings without db running.use_db_for_application_settingsMarin Jankovski2015-09-011-1/+13
* | Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0121-63/+127
|\ \
| * | Require gitlab/markdown in ReferenceExtractorRobert Speicher2015-09-011-0/+2
| * | Remove unnecessary `strip` from `reference_class` methodRobert Speicher2015-08-311-1/+1
| * | Move REDCARPET_OPTIONS to a private methodRobert Speicher2015-08-311-14/+16
| * | Make sure the main Gitlab::Markdown module gets loaded before filtersRobert Speicher2015-08-2718-1/+28
| * | Reference filters no longer take a custom class context optionRobert Speicher2015-08-272-3/+1
| * | Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-274-59/+94
* | | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-015-13/+54
|\ \ \
| * | | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-015-13/+54
| * | | Sort issues by creation date in Bitbucket importerStan Hu2015-09-011-1/+1
| | |/ | |/|
* | | Be more defensive when running 'kill'gitlab-git-http-serverJacob Vosmaer2015-08-311-1/+1
* | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-315-7/+96
|\ \ \ | |/ /
| * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2921-60/+690
| |\ \
| | * \ Merge branch 'fix-session_expire_delay' into 'master'Stan Hu2015-08-281-1/+1
| | |\ \ | | | |/ | | |/|
| | | * fixed connection detection so settings can be read from the databaseEric Maziade2015-08-271-1/+1
| | * | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-273-3/+87
| | |\ \ | | | |/ | | |/|
| | | * Add `count` to Themes and ColorSchemesRobert Speicher2015-08-262-0/+10
| | | * Add `Gitlab::Themes.for_user`Robert Speicher2015-08-261-0/+13
| | | * Remove user_color_scheme_classRobert Speicher2015-08-251-3/+2
| | | * Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-251-0/+62
| * | | Minor refactorDouwe Maan2015-08-291-7/+8
| * | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-3/+7
* | | | Replace grack with gitlab-git-http-serverJacob Vosmaer2015-08-315-73/+115
| |/ / |/| |
* | | Fix init script for Reply by emailDouwe Maan2015-08-251-1/+1
| |/ |/|
* | Ability to search milestonesmilestone_searchValery Sizov2015-08-241-1/+13
View Lorry Controller Status