summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
|\
| * FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
| * Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-201-1/+2
* | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-1/+2
* | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-11/+29
|\ \
| * | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-2/+1
| * | Allow relative links to go up one directory levelRobert Speicher2015-09-181-11/+30
| |/
* | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-212-15/+10
|/
* Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-11/+54
|\
| * Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| * Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| * Add attributes to LDAP::Config.Douwe Maan2015-09-082-3/+8
| * Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-083-11/+57
* | Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-113-6/+16
|\ \
| * \ 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
| |/ /
| * | Gracefully handle errors in syntax highlighting by leaving the block unformattedStan Hu2015-09-101-1/+5
| * | 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 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets2015-09-0936-59/+744
|\ \ \ \ | |/ / /
| * | | FogBugz project importJared Szechy2015-09-085-0/+424
| | |/ | |/|
| * | Fix URL construction for merge requests, issues, notes, and commits for relat...Stan Hu2015-09-041-6/+2
| |/
| * 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-021-10/+15
| |/
| * 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-0120-18/+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-273-14/+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
| | | |/ | | |/|
| * | | Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-serverJacob Vosmaer2015-08-314-4/+94
| |\ \ \ | | |/ /
| | * | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2917-33/+429
| | |\ \
| | | * \ 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
| | | * | Add `count` to Themes and ColorSchemesRobert Speicher2015-08-262-0/+10
| | | * | Add `Gitlab::Themes.for_user`Robert Speicher2015-08-261-0/+13
| | | * | 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-311-8/+8
| | |/ | |/|
* | | Move helpers back to original directoryDmitriy Zaporozhets2015-09-091-1/+1
View Lorry Controller Status