summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Enable SSL verification for Webhooksenable_ssl_verification_web_hookValery Sizov2015-08-2615-16/+90
|
* Merge branch 'milestone_search' into 'master'Dmitriy Zaporozhets2015-08-248-4/+73
|\ | | | | | | | | | | | | | | Ability to search milestones https://dev.gitlab.org/gitlab/gitlabhq/issues/2473 See merge request !1158
| * Ability to search milestonesmilestone_searchValery Sizov2015-08-248-4/+73
|/
* Merge branch 'clear-and-retry-bitbucket-access-token' into 'master'Douwe Maan2015-08-2321-83/+162
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab and request them each session Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871 See merge request !1112
| * Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-2321-83/+162
|/ | | | | | | | | | | | | | | | | | | | | | | and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871
* 7.14.0 is releasedStan Hu2015-08-231-1/+1
|
* Specify the branch name of the blog post to prevent the use of spaces.Sytse Sijbrandij2015-08-221-3/+4
|
* Merge branch 'master' into 'master'Stan Hu2015-08-223-28/+45
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Fixes #xxxx" now shows up in the issue log for non-default branches. #2190 I don't understand why the commits containing "closing references" (like `closes #xxxx`) were not mentioned in the corresponding issues **when pushed to a non-default branch**. So I tried to discover how it works -- hence learning Ruby! I don't expect that MR to pass, this is my very first attempt of contribution. **Update:** my modifications are now done. To sum up: - when a commit with a reference `fixes #xxxx` is pushed to a non-default branch, a cross-reference to that issue will be created; - when that same commit is pushed to a default branch, no cross-reference will be created because a message `This commit closes issue` will be emitted. - I also refined some of the existing tests and added 2 tests on the new behavior on non-default branches. See merge request !1150
| * Create cross-reference for closing references on commits pushed to ↵Maël Valais2015-08-223-28/+45
|/ | | | | | | | | | | non-default branches. I also revamped the tests on "closing reference commits" (= "Fixes #xxxx" for example). Now, there are two different contexts: - when the commits with "closing reference" are pushed to the default branch, - when the commits with "closing reference" are pushed to a non-default branch. Closes gitlab-org/gitlab-ce#2190.
* Merge branch 'reply-by-email' into 'master'Robert Speicher2015-08-2263-143/+3674
|\ | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
| * No HTML-only email pleaseDouwe Maan2015-08-216-250/+65
| |
| * Add development documentation for real.Douwe Maan2015-08-211-2/+70
| |
| * Fix check task for development.Douwe Maan2015-08-211-2/+2
| |
| * Add development section to doc.Douwe Maan2015-08-212-4/+28
| |
| * Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-213-0/+15
| |
| * 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 again. Apparently development and test behave differently.Douwe Maan2015-08-201-2/+1
| |
| * Fix markdown specs.Douwe Maan2015-08-202-1/+2
| |
| * Fix indentationDouwe Maan2015-08-201-2/+2
| |
| * Fix MailRoom running check.Douwe Maan2015-08-201-3/+3
| |
| * Remove weirdness.Douwe Maan2015-08-201-1/+1
| |
| * Add gitlab:reply_by_email:check rake task.Douwe Maan2015-08-203-3/+157
| |
| * Add stub_reply_by_email_setting helper.Douwe Maan2015-08-203-8/+11
| |
| * Use heredocs.Douwe Maan2015-08-202-124/+107
| |
| * Add fixture_file helper.Douwe Maan2015-08-208-29/+16
| |
| * Update spec.Douwe Maan2015-08-201-2/+2
| |
| * Remove more unused fixtures.Douwe Maan2015-08-205-245/+0
| |
| * Removed unused fixtures.Douwe Maan2015-08-2011-417/+1
| |
| * Merge branch 'master' into reply-by-emailDouwe Maan2015-08-20146-1659/+1229
| |\
| * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-202-9/+144
| | |
| * | Test EmailReceiverWorker.Douwe Maan2015-08-202-5/+56
| | |
| * | Test Email::AttachmentUploader.Douwe Maan2015-08-203-25/+51
| | |
| * | Make error class names more consistent.Douwe Maan2015-08-202-7/+7
| | |
| * | Fix a couple of whoopsy daisies.Douwe Maan2015-08-202-2/+4
| | |
| * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-209-814/+561
| | |
| * | Use canonical version of mail_room.Douwe Maan2015-08-202-9/+3
| | |
| * | Start on tests.Douwe Maan2015-08-1935-19/+3311
| | |
| * | Make documentation clearer.Douwe Maan2015-08-192-2/+19
| | |
| * | Fix init.d script.Douwe Maan2015-08-191-15/+15
| | |
| * | Test Gitlab::ReplyByEmail.Douwe Maan2015-08-191-0/+86
| | |
| * | Fix Basemailer#can?Douwe Maan2015-08-191-1/+1
| | |
| * | Fix lib/support/init.d/gitlab.Douwe Maan2015-08-191-20/+22
| | |
| * | Fix bin/mail_room.Douwe Maan2015-08-191-8/+9
| | |
| * | Add documentation.Douwe Maan2015-08-194-13/+112
| | |
| * | Update init scripts.Douwe Maan2015-08-195-22/+137
| | |
| * | Add Reply by email feature to admin dashboard.Douwe Maan2015-08-191-0/+4
| | |
| * | Fix BaseMailer.Douwe Maan2015-08-191-19/+1
| | |
| * | We'll get the <p> for free.Douwe Maan2015-08-191-2/+1
| | |
| * | Markdown, not GFM.Douwe Maan2015-08-191-1/+1
| | |