summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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-227-24/+528
|\ \
| * | No HTML-only email pleaseDouwe Maan2015-08-212-153/+6
| * | Fix check task for development.Douwe Maan2015-08-211-2/+2
| * | Add development section to doc.Douwe Maan2015-08-211-2/+26
| * | 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
| * | Fix MailRoom running check.Douwe Maan2015-08-201-3/+3
| * | Add gitlab:reply_by_email:check rake task.Douwe Maan2015-08-202-3/+151
| * | Merge branch 'master' into reply-by-emailDouwe Maan2015-08-2019-756/+122
| |\ \
| * | | 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
| * | | Fix init.d script.Douwe Maan2015-08-191-15/+15
| * | | Fix lib/support/init.d/gitlab.Douwe Maan2015-08-191-20/+22
| * | | Update init scripts.Douwe Maan2015-08-192-20/+84
| * | | 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
* | | | Merge branch 'rs-dev-issue-2550' into 'master'Douwe Maan2015-08-211-1/+7
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550Robert Speicher2015-08-201-1/+7
| | |/ | |/|
* | | Merge branch 'fix-backup-restore' into 'master'Robert Speicher2015-08-211-2/+3
|\ \ \
| * | | Do not delete the SQL dump too earlyJacob Vosmaer2015-08-211-2/+3
| |/ /
* | | Merge pull request #9535 from bbodenmiller/patch-3Jacob Vosmaer2015-08-211-0/+52
|\ \ \ | |/ / |/| |
| * | check uploads dirBen Bodenmiller2015-08-161-0/+52
* | | Import sources: settings in the admin interfaceArtem Sidorenko2015-08-202-1/+31
* | | Merge branch 'remove-satellites'Dmitriy Zaporozhets2015-08-1916-755/+90
|\ \ \
| * \ \ Merge branch 'master' into remove-satellitesDmitriy Zaporozhets2015-08-174-4/+10
| |\ \ \
| * | | | Refactor pre/post receive commit services into one classDmitriy Zaporozhets2015-08-141-0/+59