summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge branch 'lfs-ssh-authorization-fix' into 'master' Douwe Maan2016-09-282-6/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called ## What does this MR do? Do not regenerate the `lfs_token` every time `git-lfs-authenticate` is called, instead return the saved token if one is present. This was causing a lot of 401s, leading to 403s, as state in #22527 As it turns out, when pushing a lot of LFS objects, the LFS client was calling `git-lfs-authenticate` in the middle of the request again. This caused the `lfs_token` to be regenerated. The problem lies in that the LFS client was not aware of this change, and was still using the old token. This caused all subsequent requests to fail with a 401 error. Since HTTP Auth is protected by Rack Attack, this 401s where immediately flagged and resulted in the IP of the user being banned. With this change, GitLab returns the value stored in Redis, if one is present, thus if the LFS client calls `git-lfs-authenticate` again during the request, the auth header will remain unchanged, allowing all subsequent requests to continue without issues. ## What are the relevant issue numbers? Fixes #22527 cc @SeanPackham @jacobvosmaer-gitlab See merge request !6551
| | * | | Handle LFS token creation and retrieval in the same method, and in the same ↵lfs-ssh-authorization-fixPatricio Cano2016-09-282-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redis connection. Reset expiry time of token, if token is retrieved again before it expires.
| * | | | Log LDAP lookup errors and don't swallow unrelated exceptionsMarkus Koller2016-09-281-3/+34
| | |/ / | |/| | | | | | | | | | Signed-off-by: Roger Meier <r.meier@siemens.com>
| * | | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-271-0/+2
| | | |
| * | | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * No need to re-fetch issues from GH to read their labels, the labels are already there from the index request. * No need to look up labels on the database for every application, so we cache them.
| * | | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-271-1/+1
| |/ / | | | | | | | | | | | | This should avoid having large memory growth when importing GitHub repos with lots of resources.
| * | fix model order in import/export config and 1to1 relation issue. Added ↵James Lopez2016-09-272-1/+43
| |/ | | | | | | relevant specs.
| * added more specsJames Lopez2016-09-261-1/+1
| |
| * Fixes issue with rails reserved keyword type exporting/importing services. ↵James Lopez2016-09-263-0/+12
| | | | | | | | Also fixed CustomIssueTrackerService title setter and added relevant specs.
| * Merge branch '22229-use-base-sha-when-downloading-merge-requests' into 'master' Robert Speicher2016-09-251-3/+37
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use base SHA for patches and diffs ## What does this MR do? Switch from using 'start SHA' to 'base SHA' for patches and diffs ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Makes the downloaded patches and diffs on the merge request page match the frontend-rendered "changes" in these scenarios: * Unpatched gitlab-workhorse, downloading patchsets of open MRs (https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/68) * Unpatched gitlab-workhorse, downloading diffs of open and merged MRs * Patched gitlab-workhorse, downloading patchsets of merged merge requests ## What are the relevant issue numbers? Closes #22229 See merge request !6435
| | * Use base SHA for patches and diffsNick Thomas2016-09-221-3/+37
| | | | | | | | | | | | | | | | | | | | | This commit changes the revisions used for diffs. The current behaviour is to show all changes between current tip of master and tip of the MR, rather than matching the output of the web frontend (which just shows the changes in the MR). Switching from start_sha to base_sha fixes this.
| * | Make Gitlab::Redis.params safe for mutationJacob Vosmaer2016-09-221-7/+45
| | |
| * | fix import/export security specs after mergeJames Lopez2016-09-212-1/+12
| | |
| * | fixing security specs after mergeJames Lopez2016-09-212-1/+22
| | |
| * | Merge branch 'add_spec_for_committer_hash' into 'master' Rémy Coutable2016-09-211-0/+45
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add spec covering 'committer_hash' Adds a missing spec from changes added in !5822 See merge request !6433
| | * | Add spec covering 'committer_hash'Dan Dunckel2016-09-201-0/+45
| | |/
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-09-2113-51/+649
| |\ \
| | * | Improve JwtController implementationpost-merge-improve-of-ci-permissionsKamil Trzcinski2016-09-201-3/+5
| | | |
| | * | Post-merge improve of CI permissionsKamil Trzcinski2016-09-202-4/+10
| | |/
| * | Merge branch 'feature/import-export-security-specs' into 'master' Douwe Maan2016-09-204-0/+597
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import/Export security specs Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/20857 Related: https://gitlab.com/gitlab-org/gitlab-ce/issues/20821/ See merge request !1987
| | * | refactored some stuff and added new models / attributes after rebaseJames Lopez2016-09-093-3/+13
| | | |
| | * | more spec refactoring based on feedbackJames Lopez2016-09-093-43/+317
| | | |
| | * | fix attributes missing in spec after rebase with masterJames Lopez2016-09-091-2/+2
| | | |
| | * | remove extra lineJames Lopez2016-09-091-1/+0
| | | |
| | * | fix wordingJames Lopez2016-09-092-2/+2
| | | |
| | * | fixing a couple of bugs and lots of refactoring of the export file specJames Lopez2016-09-094-214/+186
| | | |
| | * | add model configuration spec to check for new models. Also refactored ↵James Lopez2016-09-093-14/+256
| | | | | | | | | | | | | | | | attribute_configuration spec
| | * | more refactoring of the specsJames Lopez2016-09-091-2/+15
| | | |
| | * | refactored specs based on feedbackJames Lopez2016-09-091-3/+7
| | | |
| | * | fixed failing specJames Lopez2016-09-091-1/+1
| | | |
| | * | fix specs so they work in EE straight awayJames Lopez2016-09-091-4/+4
| | | |
| | * | Export integration test and attribute change spec - squashedJames Lopez2016-09-091-0/+83
| | | | | | | | | | | | | | | | | | | | | | | | Export file integration test that checks for sensitive info. Also added spec to check new added attributes to models that can be exported.
* | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2113-51/+641
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (206 commits) Implement fourth round of comments from @DouweM. Fix `CreateDeploymentService` spec. Reload issues in spec to ensure label<->issue mapping properly loaded Fix build. Remove unnecessary #{} in cycle analytics template. Update cycle analytics icon and fix color of the dismiss button. Use triple dashes for the empty value in cycle analytics. Fix typo on cycle analytics copy. Add page title and fix sub menu width in Cycle Analytics page. Update Cycle Analytics Read more link URL. Display the cycle analytics navbar based on the `:read_cycle_analytics` ability. Improve indentation in `Gitlab::Database::Median` Add a spec for merge request metric caching while refreshing a merge request from a forked project. Use the `IssuableBaseService` lifecycle hooks to cache `MergeRequestsClosingIssues` Implement a second round of review comments from @DouweM. Add docs on Cycle Analytics Test if issue authors can access private projects Update .pkgr.yml with Ubuntu 16.04 dependencies fix issues mr counter Move JSON generation (cycle analytics) into a controller method. ...
| * | | Merge branch 'feature/github-edit-path' into 'master' Rémy Coutable2016-09-201-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lets the user choose a namespace and name on Github imports Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14971 See merge request !5728
| | * | | modify github import JS and controller so we can now specify a namespace ↵James Lopez2016-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and/or name for a project. - Fixed and added specs. - Added different namespace options depending on user privilages - Updated docs.
| * | | | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-202-0/+69
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LFS support for ssh enabled ## What does this MR do? This is follow-up after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043 which is falsely shown as merged due to: https://gitlab.com/gitlab-org/gitlab-ce/issues/22334 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !6413
| | * | | Fix test failureKamil Trzcinski2016-09-191-1/+1
| | | | |
| | * | | Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-192-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
| * | | | Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher2016-09-201-4/+28
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strip comments before sending keys to gitlab-shell ## Why was this MR needed? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 encoding issues in comment text. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/22167 See merge request !6381
| | * | | | Strip comments before sending keys to gitlab-shellJacob Vosmaer2016-09-161-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid issues with text encoding by not sending out non-7-bit ASCII text. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22167
| * | | | | Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-194-31/+191
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CI to use the permission of the user who is trigger the build This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5735, but with removed all LFS code that is added by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043. This also incorporates most of LFS code added in !6043 to simplify further merge. See merge request !6409
| | * | | | Revert all changes introduced by ↵Kamil Trzcinski2016-09-192-69/+0
| | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
| | * | | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-194-44/+304
| | |\ \ \ \
| | * | | | | Fix spec failuresKamil Trzcinski2016-09-191-1/+1
| | | | | | |
| | * | | | | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-0/+19
| | | | | | |
| | * | | | | Fix specs for available statusesKamil Trzcinski2016-09-161-2/+2
| | | | | | |
| | * | | | | Fix specs after renaming authentication_capabilitiesKamil Trzcinski2016-09-162-11/+13
| | | | | | |
| | * | | | | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-163-23/+23
| | | | | | |
| | * | | | | Fix specs after merging LFS changesKamil Trzcinski2016-09-151-3/+3
| | | | | | |
| | * | | | | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-152-1/+70
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/git_http_client_controller.rb # app/helpers/lfs_helper.rb # lib/gitlab/auth.rb # spec/requests/lfs_http_spec.rb
View Lorry Controller Status