summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan2015-08-261-1/+1
|\
| * Fix init script for Reply by emailDouwe Maan2015-08-251-1/+1
* | Update gitignore, change literal DB table names, fix errors, fix fontawesomeDouwe Maan2015-08-261-3/+3
* | Groundwork for merging CI into CEDouwe Maan2015-08-2536-10/+1719
|/
* 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
| * | | | Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets2015-08-1115-754/+31
* | | | | Merge pull request #9567 from bigsurge/bigsurge-patch-1Stan Hu2015-08-191-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add CommitNote field expose :created_atbigsurge2015-08-191-0/+1
* | | | | 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 'fix-rake-info' into 'master'Robert Speicher2015-08-181-2/+1
|\ \ \ \ \
| * | | | | Fix gitlab:env:info rake task.fix-rake-infoDouwe Maan2015-08-171-2/+1
| |/ / / /
* | | | | 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-172-12/+2
|\ \ \ \ \ \