summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ |/|
* | Ability to search milestonesmilestone_searchValery Sizov2015-08-241-1/+13
* | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-238-30/+54
* | Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-224-0/+269
|\ \
| * | No HTML-only email pleaseDouwe Maan2015-08-212-153/+6
| * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+3
| * | Memoize address_regex locally.Douwe Maan2015-08-201-2/+3
| * | Fix spec by removing global state.Douwe Maan2015-08-201-8/+6
| * | Fix markdown specs.Douwe Maan2015-08-201-1/+1
| * | Fix indentationDouwe Maan2015-08-201-2/+2
| * | Add gitlab:reply_by_email:check rake task.Douwe Maan2015-08-201-3/+6
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-2013-635/+90
| |\ \ | | |/
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-9/+9
| * | Make error class names more consistent.Douwe Maan2015-08-201-5/+5
| * | Fix a couple of whoopsy daisies.Douwe Maan2015-08-202-2/+4
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-206-325/+362
| * | Start on tests.Douwe Maan2015-08-191-19/+18
| * | Send a rejection email when the incoming email couldn't be processed.Douwe Maan2015-08-191-6/+10
| * | Turn reply-by-email attachments into uploads.Douwe Maan2015-08-191-0/+33
| * | Changes and stuff.Douwe Maan2015-08-183-19/+305
| * | Reply by email POCDouwe Maan2015-08-181-0/+50
* | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-1/+7
| |/ |/|
* | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-202-1/+31
* | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1911-634/+59
|\ \ | |/ |/|
| * Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-171-1/+1
| |\
View Lorry Controller Status