summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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/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
| | | * | | Refactored authentication code to make it a bit clearer, added test for ↵Patricio Cano2016-09-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | wrong SSH key.
| | | * | | Use special characters for `lfs+deploy-key` to prevent a someone from ↵Patricio Cano2016-09-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | creating a user with this username, and method name refactoring.
| | | * | | Refactored handling of the `LfsToken` and added functionality to it to ↵Patricio Cano2016-09-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | simplify external code.
| | | * | | Refactored LFS auth logic when using SSH to use its own API endpoint ↵Patricio Cano2016-09-152-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | `/lfs_authenticate` and added tests.
| | | * | | Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵Patricio Cano2016-09-152-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | a 1 use only token.
| | | * | | Added LFS support to SSHPatricio Cano2016-09-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | - Required on the GitLab Rails side is mostly authentication and API related.
| | * | | | Fix most of specsKamil Trzcinski2016-09-152-4/+19
| | | | | |
| | * | | | Fix existing authorization specsKamil Trzcinski2016-09-151-5/+12
| | | | | |
| | * | | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-157-2/+112
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| | * | | | Add access specsKamil Trzcinski2016-09-152-30/+147
| | | | | |
| * | | | | Merge branch 'fix/import-export-db-errors' into 'master' Rémy Coutable2016-09-193-12/+106
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix import/export database errors Fixes protected branches errors when importing a project including them Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21295 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/21799 See merge request !6099
| | * | | | squashed - Fix DB exceptions raised importing some specific projects.James Lopez2016-09-193-12/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better import of labels, milestones and protected branches. Updated relevant specs. Loose pipeline validation on importing, so it does not fail when there are missing fields, which are not validated at DB level. Also, updated spec with relevant test.
| * | | | | Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
| * | | | | Fix CI job environment configuration attributesGrzegorz Bizon2016-09-191-2/+3
| | | | | |
| * | | | | Update support for dynamic environmentsKamil Trzcinski2016-09-191-0/+14
| | | | | |
| * | | | | Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-191-0/+73
| | | | | |
| * | | | | Add validation of URL and validation of nameKamil Trzcinski2016-09-191-0/+30
| | | | | |
| * | | | | Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-191-0/+125
| |/ / / /
* | | | | 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
View Lorry Controller Status