summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Revert all changes introduced by ↵lfs-supportKamil Trzcinski2016-09-194-0/+96
| | | | | | 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-194-96/+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-1911-43/+144
|\
| * 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-193-3/+4
| |
| * 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-193-16/+12
| |
| * Verify expandability of variables defined as part of environmentKamil Trzcinski2016-09-191-10/+12
| |
| * Properly create deployment using all possible optionsKamil Trzcinski2016-09-191-0/+9
| |
| * Add validation of URL and validation of nameKamil Trzcinski2016-09-191-0/+5
| |
| * Add new CI configuration entry for the environmentGrzegorz Bizon2016-09-193-10/+32
| |
| * Add support for dynamic environmentsKamil Trzcinski2016-09-193-2/+50
| | | | | | | | Environments that can have a URL with predefined CI variables.
| * Replace contributions calendar timezone payload with datesClement Ho2016-09-161-9/+8
| |
| * Fix API notes endpoint when posting only emojiZ.J. van de Weg2016-09-161-4/+4
| |
| * Merge branch 'integer_migration_style' into 'master' Yorick Peterse2016-09-161-2/+8
| |\ | | | | | | | | | | | | Integer migration style See merge request !6334
| | * Add support for column limits in add_column_with_defaultDrew Blessing2016-09-151-2/+8
| | |
| * | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-151-2/+4
| | |
| * | Added group-specific setting for LFS.Patricio Cano2016-09-152-3/+5
| |/ | | | | | | Groups can enable/disable LFS, but this setting can be overridden at the project level. Admin only
* | Support pushing via SSHKamil Trzcinski2016-09-192-1/+12
| |
* | Don't leak build tokens in build logsKamil Trzcinski2016-09-191-0/+9
| |
* | 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-163-21/+21
| |
* | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-154-19/+93
|\ \ | | | | | | | | | | | | | | | | | | | | | # 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-153-29/+36
| | | | | | | | | | | | 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-153-18/+29
| | | | | | | | | | | | simplify external code.
| * | Refactored LFS auth logic when using SSH to use its own API endpoint ↵Patricio Cano2016-09-153-17/+25
| | | | | | | | | | | | `/lfs_authenticate` and added tests.
| * | Refactor LFS token logic to use a Redis key instead of a DB field, making it ↵Patricio Cano2016-09-154-10/+42
| | | | | | | | | | | | a 1 use only token.
| * | Added LFS support to SSHPatricio Cano2016-09-153-3/+25
| |/ | | | | | | - 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-152-4/+3
| | |
* | | Fix existing authorization specsKamil Trzcinski2016-09-153-12/+10
| | |
* | | Merge remote-tracking branch 'origin/master' into per-build-tokenKamil Trzcinski2016-09-1517-46/+122
|\ \ \ | |/ / | | | | | | | | | # Conflicts: # db/schema.rb
| * | Clean environment variables when running git hooksfix_custom_hook_envsValery Sizov2016-09-151-5/+7
| |/
| * Merge branch 'houqp-master' into 'master' Robert Speicher2016-09-141-0/+1
| |\ | | | | | | | | | | | | | | | | | | Fix wiki headeline linking Fixes #21817 See merge request !6300
| | * Fix URLs with anchors in wikiQingping Hou2016-09-131-0/+1
| | |
| * | 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
View Lorry Controller Status