Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-09-21Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan
2015-09-18remove API calls from CE to CIValery Sizov
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-11Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu
timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09FogBugz project importJared Szechy
2015-08-28Expire cache when merge request source branch was removedDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDouwe Maan
2015-08-26Groundwork for merging CI into CEDouwe Maan
2015-08-25Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets
Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to prevent Sidekiq retries ### What does this MR do? This MR gracefully handles SMTP input errors (e.g. incorrect or invalid e-mail addresses) to prevent these types of exceptions from causing Sidekiq to retry the task. If these specific exceptions occur, they will be logged, and the e-mail will be dropped from the queue. ### Why was this MR needed? If you include an author that has a misspelled e-mail address, Sidekiq will keep sending e-mail to all the recipients even if they have already received the e-mail. The only way to recover is to clear the Sidekiq queue. Note that other exceptions can still be thrown (e.g. `IOError`, `Net::SMTPAuthenticationError`, `Net::SMTPServerBusy`, `Net::SMTPUnknownError`, and `TimeoutError`). If the worker encounters these, Sidekiq should retry the task. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9560 See merge request !1163
2015-08-24Ignore empty incoming messages.Douwe Maan
2015-08-23Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu
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
2015-08-21Block blocked users from replying to threads by email.Douwe Maan
2015-08-20Merge branch 'master' into reply-by-emailDouwe Maan
2015-08-20Make error class names more consistent.Douwe Maan
2015-08-20Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan
2015-08-20Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ↵Stan Hu
prevent Sidekiq retries Closes https://github.com/gitlabhq/gitlabhq/issues/9560
2015-08-19Send a rejection email when the incoming email couldn't be processed.Douwe Maan
2015-08-19Changes and stuff.Douwe Maan
2015-08-19Reply by email POCDouwe Maan
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Trigger post-receive hoooks when commits are made by GitLabDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17Avoid cache building for super-weird case when repository root_ref is nilDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17Store commit count in project tableDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-17Build missing cache items in background job after each pushDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16Huge refactoring for accepting merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-15Remove satellitesDmitriy Zaporozhets
2015-07-05Add Irker service configuration optionsStan Hu
Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
2015-05-08Added X-GitLab-Event header for web hooksbugagazavr
2015-04-27Revert "Added X-GitLab-Event header for web hooks"Valery Sizov
This reverts commit 548f182814acd0f7a110e6c165c186e345901b00.
2015-04-25Added X-GitLab-Event header for web hooksbugagazavr
2015-04-24Let commit model know about its project.Douwe Maan
2015-04-15Merge branch 'google-code-import' into 'master'Douwe Maan
Import projects from Google Code. Resolves #1257. Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000). ### To do - [x] List projects from Google Takeout file - [x] Import Git repository - [x] Import issues - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50) - [x] Handle deleted attachments - [x] Handle blockedOn attribute - [x] Add directions on how to get data from Google Takeout ### Import instructions ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png) ### Imported issue ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png) See merge request !471
2015-04-12Merge branch 'regex-start-of-string' into 'master'Dmitriy Zaporozhets
Fix persistent XSS vulnerability around profile website URLs. Fixes gitlab/gitlab-ee#268 See merge request !1761
2015-04-10Use `\A` and `\z` in regexes instead of `^` and `$`.Douwe Maan
2015-04-06CI forking: testsValery Sizov
2015-04-06CI project forkingValery Sizov
2015-04-03Allow projects to be imported from Google Code.Douwe Maan
2015-03-31Add tests.Douwe Maan
2015-03-31Small code cleanup.Douwe Maan
2015-03-31Archive repositories in background worker.Douwe Maan
2015-03-26Fix EmailsOnPush.Douwe Maan
2015-03-23Merge branch 'emailsonpush-create-delete' into 'master'Dmitriy Zaporozhets
Send EmailsOnPush email when branch or tag is created or deleted. Addresses #1951, #1957 and #1925. ![Screen_Shot_2015-03-17_at_13.58.15](https://dev.gitlab.org/gitlab/gitlabhq/uploads/16ff25adb4b4a7e1923612e0652442b4/Screen_Shot_2015-03-17_at_13.58.15.png) ![Screen_Shot_2015-03-17_at_13.58.22](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e346c1d84aba3a093b722d0a4167e289/Screen_Shot_2015-03-17_at_13.58.22.png) ![Screen_Shot_2015-03-17_at_13.58.28](https://dev.gitlab.org/gitlab/gitlabhq/uploads/720437ecc13f317c6d20eff82ac60bd7/Screen_Shot_2015-03-17_at_13.58.28.png) ![Screen_Shot_2015-03-17_at_13.58.34](https://dev.gitlab.org/gitlab/gitlabhq/uploads/2b302bb6cdbe27c96a8dff1375236602/Screen_Shot_2015-03-17_at_13.58.34.png) See merge request !1709
2015-03-23Clean up code by using keyword arguments.Douwe Maan
2015-03-19Fewer constants, more helpers.Douwe Maan
2015-03-18Send EmailsOnPush email when branch or tag is created or deleted.Douwe Maan
2015-03-15Prevent gitlab-shell character encoding issues by receiving its changes as ↵Douwe Maan
raw data.
2015-03-10Use Gitlab::Git helper methods and constants as much as possible.Douwe Maan