summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-193-0/+83
| | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043" This reverts commit 6d43c95b7011ec7ec4600e00bdc8df76bb39813c.
* Solve code review commentsKamil Trzcinski2016-09-191-1/+1
|
* Properly support Gitlab::Auth::ResultKamil Trzcinski2016-09-192-8/+8
|
* Revert all changes introduced by ↵Kamil Trzcinski2016-09-193-83/+0
| | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6043
* Move Gitlab::Auth.Result to separate fileKamil Trzcinski2016-09-192-14/+17
|
* Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-195-35/+105
|\
| * Fix validation regexs (+1 squashed commit)Kamil Trzcinski2016-09-191-2/+2
| | | | | | | | | | Squashed commits: [f9a9315] Use : to test invalid environment name
| * Fix scope of the CI config key nodes in jobs entryGrzegorz Bizon2016-09-191-13/+13
| |
| * Fix environments handlingKamil Trzcinski2016-09-191-2/+2
| |
| * Restore validation of CI job environment nameGrzegorz Bizon2016-09-191-0/+9
| |
| * Fix CI job environment configuration attributesGrzegorz Bizon2016-09-192-2/+3
| |
| * Fix CI job environment configuration entry classGrzegorz Bizon2016-09-191-8/+11
| |
| * Cleanup changesKamil Trzcinski2016-09-191-5/+2
| |
| * Update support for dynamic environmentsKamil Trzcinski2016-09-192-15/+11
| |
| * Add validation of URL and validation of nameKamil Trzcinski2016-09-191-0/+5
| |
| * Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-192-9/+30
| |
| * Add support for dynamic environmentsKamil Trzcinski2016-09-192-2/+35
| | | | | | | | Environments that can have a URL with predefined CI variables.
| * Replace contributions calendar timezone payload with datesClement Ho2016-09-161-9/+8
| |
| * Add support for column limits in add_column_with_defaultDrew Blessing2016-09-151-2/+8
| |
* | Support pushing via SSHKamil Trzcinski2016-09-192-1/+12
| |
* | Fix permissions for creating container imagesKamil Trzcinski2016-09-191-1/+1
| |
* | Simplify checking of allowed abilities in git_http_client_controllerKamil Trzcinski2016-09-161-0/+10
| |
* | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-162-18/+18
| |
* | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-153-19/+80
|\ \ | | | | | | | | | | | | | | | | | | | | | # 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-24/+21
| | | | | | | | | | | | wrong SSH key.
| * | Further refactoring of authentication code, and code style fixes.Patricio Cano2016-09-152-39/+36
| | |
| * | Use special characters for `lfs+deploy-key` to prevent a someone from ↵Patricio Cano2016-09-152-2/+2
| | | | | | | | | | | | creating a user with this username, and method name refactoring.
| * | Better authentication handling, syntax fixes and better actor handling for ↵Patricio Cano2016-09-152-21/+35
| | | | | | | | | | | | LFS Tokens
| * | Improve string handling.Patricio Cano2016-09-151-2/+2
| | |
| * | Refactored handling of the `LfsToken` and added functionality to it to ↵Patricio Cano2016-09-152-9/+18
| | | | | | | | | | | | simplify external code.
| * | Refactored LFS auth logic when using SSH to use its own API endpoint ↵Patricio Cano2016-09-152-5/+7
| | | | | | | | | | | | `/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-5/+36
| | | | | | | | | | | | a 1 use only token.
| * | Added LFS support to SSHPatricio Cano2016-09-151-1/+12
| |/ | | | | | | - Required on the GitLab Rails side is mostly authentication and API related.
| * Merge branch 'fix-old-migration-repos-path-key' into 'master' Robert Speicher2016-09-151-4/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update references to deprecated `repos_path` configuration key to avoid ## What does this MR do? Update references to deprecated `repos_path` configuration key to avoid errors when updating GitLab from older versions ## Why was this MR needed? Users were reporting errors when upgrading from GitLab 6.7 ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1464 See merge request !6350
| | * Update references to deprecated `repos_path` configuration key to avoidfix-old-migration-repos-path-keyAlejandro Rodríguez2016-09-141-4/+0
| | | | | | | | | | | | errors on updates from older versions
* | | Fix most of specsKamil Trzcinski2016-09-151-2/+1
| | |
* | | Fix existing authorization specsKamil Trzcinski2016-09-152-2/+2
| | |
* | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-1511-19/+75
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # db/schema.rb
| * | Clean environment variables when running git hooksfix_custom_hook_envsValery Sizov2016-09-151-5/+7
| |/
| * Merge branch 'fix/gitlab-popen-thread-safety' into 'master' Stan Hu2016-09-141-6/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Gitlab::Popen.popen thread-safety issue ## What does this MR do? It changes the instance variables of `Gitlab::Popen.popen` to a local ones. ## Are there points in the code the reviewer needs to double check? N/A ## Why was this MR needed? It fixes a bug! ## Screenshots (if relevant) N/A ## Does this MR meet the acceptance criteria? - [x] [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~~ - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #21842 See merge request !6194
| | * Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-131-6/+6
| | | | | | | | | | | | Fixes #21842
| * | Allow trailing newline in secret base64 dataJacob Vosmaer2016-09-131-1/+1
| |/
| * Merge branch 'patch-4' into 'master' Robert Speicher2016-09-131-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | Update gitlab shell secret file also when it is empty Use `File.size?` instead of `File.exist?` so that secret token is generated when the file is empty. See merge request !3774
| | * update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-131-1/+1
| | |
| * | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-132-0/+36
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub release notes ## Why was this MR needed? Release notes aren't currently migrated over when importing from GitHub ## What are the relevant issue numbers? #20780 See merge request !5981
| | * | Import GitHub release notesAndrew Smith2016-09-132-0/+36
| | |/ | | | | | | | | | | | | # Conflicts: # lib/gitlab/github_import/importer.rb
| * | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-131-0/+1
| |/ | | | | | | | | | | GitlabShell verify access sending ‘_any’ as the changes made on the git command, in those cases Gitlab::Checks::ChangeAccess won’t receive a branch_name so we don’t need to check for access to the protected branches on that repository. So we avoid some git operations in case the are not cached (empty_repo?) and some database lookups to get protected branches. These request is happening in every push.
| * Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-124-6/+23
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add original author tag line when importing from GitHub if there isn't a linked GitLab account ## What does this MR do? If there we've found a linked GitLab user for a creator of an issue or comment don't add the 'Created By:' line. ## What are the relevant issue numbers? Closes #21569 See merge request !6081
| | * Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-084-6/+23
| | |
* | | Add access specsKamil Trzcinski2016-09-151-12/+8
| | |
View Lorry Controller Status