summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| |/
| * 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
| | |/ | |/|
* | | Minor refactorDouwe Maan2015-08-291-7/+8
* | | Issue #993: Fixed login failure when extern_uid changesJoel Koglin2015-08-211-3/+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
| |\
| * | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-141-0/+59
| * | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1110-633/+0
* | | Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher2015-08-181-16/+30
|\ \ \
| * | | Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-16/+30
| | |/ | |/|
* | | Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets2015-08-181-0/+1
|\ \ \
| * | | Clear cache to prevent listing deleted branches after MR removes source branchStan Hu2015-08-141-0/+1
| |/ /
* | | Merge branch 'rs-remove-gfm_with_options' into 'master'Douwe Maan2015-08-171-11/+1
|\ \ \
| * | | Remove the `gfm_with_options` helperrs-remove-gfm_with_optionsRobert Speicher2015-08-121-11/+1
| |/ /
* | | Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan2015-08-171-2/+5
|\ \ \ | |/ / |/| |
| * | Fix bug where backslashes in inline diffs could be droppedStan Hu2015-08-111-2/+5
| |/
* | markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
|/
* Revert "Merge branch 'web-editor-rugged' into 'master'"Dmitriy Zaporozhets2015-08-114-0/+210
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-116-0/+423
* Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-108-8/+32
|\
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-088-8/+32
* | Show incompatible projects in Bitbucket import statusStan Hu2015-08-071-0/+4
|/
* Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-046-19/+68
|\