summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Add API method for get user by ID of an SSH keyArtem V. Navrotskiy2015-09-031-0/+39
|
* Merge branch 'fix-raw-controller-disposition' into 'master'Dmitriy Zaporozhets2015-09-021-0/+23
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the filename argument from Content-Disposition header This MR removes the filename argument from the `Content-Disposition` header to avoid RFC 5987 and RFC 6266 encoding issues. Some browsers (e.g. Internet Explorer) do not properly decode a Unicode string properly, and this can lead to odd filenames in the raw file download. This change allows the browser to determine the filename based on the URL. For example, if I have a file called `한글한글.pptx` and click to download it with the "Raw" button in the Files section, IE11 will ask: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/fdb688282c0d4564872deadb44c58b2c/image.png) If you look at the `Content-Disposition` field, you see this: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2b342b83ae1ec61fd31937163ace8ec5/image.png) Chrome, Firefox, and Safari seem to be able to handle UTF-8 encoded filenames, even though this is not standard. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829 I've also submitted a pull request to Rails to support RFC 6266: https://github.com/rails/rails/pull/21461 See merge request !1235
| * Remove the filename argument from Content-Disposition header to avoidStan Hu2015-09-021-0/+23
| | | | | | | | | | | | | | | | | | | | | | RFC 5987 and RFC 6266 encoding issues. This change allows the browser to determine the filename based on the URL. See: http://greenbytes.de/tech/tc2231/ Closes https://github.com/gitlabhq/gitlabhq/issues/9595 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1829
* | Drone CI serviceKirilll Zaitsev2015-09-023-58/+169
|/
* Merge branch 'rs-cleanup-redcarpet-renderer' into 'master'Douwe Maan2015-09-0111-51/+6
|\ | | | | | | | | | | | | | | | | Decouple Gitlab::Markdown from the GitlabMarkdownHelper This module is now the sole source of knowledge for *how* we render Markdown (and GFM). See merge request !1223
| * Make sure the `gfm` helper passes the required optionsRobert Speicher2015-08-311-1/+1
| | | | | | | | This adds some duplication, but this helper is temporary.
| * Remove invalid spec for GitlabMarkdownHelperRobert Speicher2015-08-311-5/+0
| |
| * Reference filters no longer take a custom class context optionRobert Speicher2015-08-278-40/+0
| |
| * Restore the forwarded HTML options in link_to_gfmRobert Speicher2015-08-271-0/+10
| |
| * Decouple Gitlab::Markdown from the GitlabMarkdownHelperRobert Speicher2015-08-272-17/+7
| | | | | | | | | | This module is now the sole source of knowledge for *how* we render Markdown (and GFM).
* | Merge branch 'fix-bitbucket-import-issue-order' into 'master'Douwe Maan2015-09-011-0/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import all Bitbucket issues and sort issues by creation date Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors. Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518 Closes https://github.com/gitlabhq/gitlabhq/issues/9519 See merge request !1226
| * | Fix bug where only the first 15 Bitbucket issues would be imported.Stan Hu2015-09-011-0/+34
| | | | | | | | | | | | Also fix a number of issues where author/reporter names were not available.
* | | Merge branch 'fix-branches-cache-after-merge' into 'master'Valery Sizov2015-09-012-1/+29
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Expire cache when merge request source branch was removed Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay :sparkles: Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1224
| * | Expire cache when merge request source branch was removedfix-branches-cache-after-mergeDmitriy Zaporozhets2015-08-282-1/+29
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'dont-notify-users-without-project-access' into 'master'Robert Speicher2015-08-301-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users without access to the project when they are (accidentally) mentioned in a note. Addresses #2366. See merge request !1216
| * | | Don't notify users without access to the project when they are ↵dont-notify-users-without-project-accessDouwe Maan2015-08-261-2/+9
| |/ / | | | | | | | | | (accidentally) mentioned in a note.
* | | Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993Douwe Maan2015-08-2945-136/+2855
|\ \ \ | | |/ | |/|
| * | Merge branch 'rs-remove-user-color-scheme-class' into 'master'Douwe Maan2015-08-275-53/+100
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply syntax highlighting to fenced code blocks client-side Instead of applying the syntax highlighting scheme class to these blocks server-side, we use Javascript and Gon to apply the user's color scheme (or the default) client-side. This will make it easier to cache these blocks in the future because they're no longer state-dependent. See merge request !1203
| | * Re-add user_color_scheme helperRobert Speicher2015-08-261-23/+54
| | | | | | | | | | | | Update PreferencesHelper specs
| | * Fix two more failing specsRobert Speicher2015-08-251-3/+2
| | |
| | * Fix failing specRobert Speicher2015-08-251-2/+2
| | |
| | * Remove user_color_scheme_classRobert Speicher2015-08-252-25/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of rendering this value server-side, we use Javascript and Gon to apply the user's color scheme (or the default) to any syntax highlighted code blocks. This will make it easier to cache these blocks in the future because they're no longer state-dependent.
| | * Add Gitlab::ColorSchemes moduleRobert Speicher2015-08-252-3/+45
| | | | | | | | | | | | | | | Very similar to Gitlab::Theme, this contains all of the definitions for our syntax highlighting schemes.
| * | Merge branch 'rs-re-enable-user-reference-spec' into 'master'Douwe Maan2015-08-251-1/+0
| |\ \ | | |/ | |/| | | | | | | | | | Re-enable the "links with adjacent text" UserReferenceFilter spec See merge request !1194
| | * Re-enable the "links with adjacent text" UserReferenceFilter specrs-re-enable-user-reference-specRobert Speicher2015-08-241-1/+0
| | |
| * | Merge branch 'handle-smtp-input-errors' into 'master'Dmitriy Zaporozhets2015-08-251-0/+34
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Gracefully handle SMTP user input errors (e.g. incorrect email addresses) to ↵Stan Hu2015-08-191-0/+34
| | | | | | | | | | | | | | | | | | prevent Sidekiq retries Closes https://github.com/gitlabhq/gitlabhq/issues/9560
| * | Fix Error 500 in API when accessing a group that has an avatarStan Hu2015-08-241-1/+2
| | | | | | | | | | | | Closes #2340
| * | Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLabStan Hu2015-08-236-29/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Create cross-reference for closing references on commits pushed to ↵Maël Valais2015-08-221-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2228-28/+2613
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reply by email Fixes #1360. It's far from done, but _it works_. See merge request !1173
| | * | No HTML-only email pleaseDouwe Maan2015-08-214-97/+59
| | | |
| | * | Block blocked users from replying to threads by email.reply-by-emailDouwe Maan2015-08-211-0/+10
| | | |
| | * | Fix markdown specs again. Apparently development and test behave differently.Douwe Maan2015-08-201-2/+1
| | | |
| | * | Fix markdown specs.Douwe Maan2015-08-201-0/+1
| | | |
| | * | 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-2014-304/+50
| | |\ \ | | | |/
| | * | Test Gitlab::Email::Receiver.Douwe Maan2015-08-201-0/+135
| | | |
| | * | Test EmailReceiverWorker.Douwe Maan2015-08-202-5/+56
| | | |
| | * | Test Email::AttachmentUploader.Douwe Maan2015-08-203-25/+51
| | | |
| | * | Extract ReplyParser and AttachmentUploader from Receiver.Douwe Maan2015-08-202-481/+191
| | | |
| | * | Start on tests.Douwe Maan2015-08-1934-0/+3293
| | | |
| | * | Test Gitlab::ReplyByEmail.Douwe Maan2015-08-191-0/+86
| | | |
| * | | Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan2015-08-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
| | * | | Fix bug preventing invite by e-mailStan Hu2015-08-211-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320