summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* sends message if the project is above the memory limitmemory-limittiagonbotelho2016-08-282-3/+18
|
* Merge branch 'feature/redis-sentinel' into 'master' v3.4.0Robert Speicher2016-08-197-23/+46
|\ | | | | | | | | | | | | | | | | Sentinel Support Sentinel connection parameters in `config.yml` file. Fixes #29 See merge request !85
| * Remove useless `.and_call_origin` from specsfeature/redis-sentinelGabriel Mazetto2016-08-191-17/+5
| |
| * Added sentinel to the changelog and version bump (v3.4.0)Gabriel Mazetto2016-08-192-1/+4
| |
| * Added specs for sentinel supportGabriel Mazetto2016-08-183-11/+29
| |
| * Sentinel connection parameters in `config.yml` fileGabriel Mazetto2016-08-182-1/+15
|/
* Merge branch 'dup-frozen-argv-key' into 'master' Robert Speicher2016-08-112-2/+3
|\ | | | | | | | | | | | | | | | | In order to use chomp! on the input later, we need to dup the ARGV input string for keys Also updated the gitlab_key tests to freeze the ARGV variables. Fixes https://gitlab.com/gitlab-org/gitlab-shell/issues/56 See merge request !84
| * In order to use chomp! on the input later, we need to dup the ARGV input ↵dup-frozen-argv-keyDJ Mountney2016-08-102-2/+3
| | | | | | | | | | | | string for keys Also updated the gitlab_key tests to freeze the ARGV variables.
* | Bump version to 3.3.3v3.3.3Douwe Maan2016-08-112-1/+4
| |
* | Merge branch 'feature/new-merge-request-url' into 'master' Douwe Maan2016-08-113-23/+138
|\ \ | |/ |/| | | | | | | | | Show Merge request link after pushing if new brach This is part of implementation for issue https://gitlab.com/gitlab-org/gitlab-ce/issues/18266 See merge request !77
| * print new merge request urls after push receivedScott Le2016-08-123-23/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update spec different text for new and existing merge request update spec fix style switch order of messages enhance message appearance remove extra spaces
* | Merge branch 'permissions-create-keys' into 'master' Robert Speicher2016-08-102-2/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update the keys permission check to open the file in write mode. That way the file is created if it does not exist. This will help simplify the check being running from omnibus. Currently we create the authorized_keys, file in omnibus. We want to instead have omnibus call check-permissions as the git user, to get around nfs root_squash issues with the authorized_keys file. See merge request !83
| * | Update the keys permission check to open the file in write mode.DJ Mountney2016-08-102-2/+9
|/ / | | | | | | That way the file is created if it does not exist.
* | Merge branch 'key-validations' into 'master' Robert Speicher2016-08-102-0/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Defense in depth for authorized_keys lines Validate the key_id and public_key inputs when rendering the actual 'line' we append to authorized_keys. Although these inputs are either trusted (key_id) or validated earlier (public_key) it does not hurt to take a little extra care that we do not write unintended data to the authorized_keys file. See merge request !82
| * | Newline after "let"key-validationsJacob Vosmaer2016-08-101-0/+1
| | |
| * | Changes proposed during reviewJacob Vosmaer2016-08-102-3/+3
| | |
| * | Defense in depth for authorized_keys linesJacob Vosmaer2016-08-052-0/+31
|/ /
* | Merge branch 'small-fixes' into 'master' Robert Speicher2016-08-043-17/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | Small improvements - refactor GitlabKey away - fix Redis check output See merge request !81
| * | Refactor 'GitlabKey' class awaysmall-fixesJacob Vosmaer2016-08-042-16/+12
| | | | | | | | | | | | | | | It is not nice to have both 'GitlabKeys' and 'GitlabKey'. We also do not need GitlabKey to be a class when it has no state.
| * | Improve output from redis checkJacob Vosmaer2016-08-041-1/+7
|/ /
* | Bump version to 3.3.2v3.3.2Douwe Maan2016-08-032-1/+4
| |
* | Merge branch 'authorized-keys-permission-check' into 'master' Douwe Maan2016-08-033-6/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Improve authorized_keys check The old check only looked if authorized_keys exists. With this change, we look whether we can actually open the file for reading and writing. When this fails we try to print useful diagnostic information. See merge request !79
| * | Add permission check tests, improve checkauthorized-keys-permission-checkJacob Vosmaer2016-08-032-4/+23
| | |
| * | Improve authorized_keys checkJacob Vosmaer2016-08-022-5/+16
|/ / | | | | | | | | | | The old check only looked if authorized_keys exists. With this change, we look whether we can actually open the file for reading and writing. When this fails we try to print useful diagnostic information.
* | Bump version to 3.3.1v3.3.1Douwe Maan2016-08-012-1/+4
| |
* | Merge branch 'keys-chmod' into 'master' Douwe Maan2016-08-013-7/+12
|\ \ | |/ |/| | | | | | | | | | | | | Manage authorized_keys permissions continuously We can lazily create authorized_keys and set its permissions. This adds negligible overhead and it allows us to remove a setup step from GitLab both on source and in omnibus-gitlab. See merge request !78
| * Manage authorized_keys permissions continuouslykeys-chmodJacob Vosmaer2016-08-013-7/+12
|/ | | | | | We can lazily create authorized_keys and set its permissions. This adds negligible overhead and it allows us to remove a setup step from GitLab both on source and in omnibus-gitlab.
* Version 3.3.0v3.3.0Jacob Vosmaer2016-07-271-1/+1
|
* Merge branch 'mv-storage' into 'master' Jacob Vosmaer (GitLab)2016-07-278-2/+232
|\ | | | | | | | | | | | | | | | | Add command to move repositories between repository storages Necessary for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/533 /cc @pcarranza See merge request !71
| * Track ongoing pushes and reject mv-storage commands if there are push ↵mv-storageAlejandro Rodríguez2016-07-278-4/+162
| | | | | | | | running (after waiting some time)
| * Add command to move repositories between repository storagesAlejandro Rodríguez2016-07-273-0/+72
|/
* Bump version to 3.2.1v3.2.1Douwe Maan2016-07-261-1/+1
|
* Merge branch ↵Douwe Maan2016-07-263-8/+43
|\ | | | | | | | | | | | | | | | | | | '51-gitlab-project-s-fork_project-command-doesn-t-work-if-the-project-is-being-forked-to-another-storage' into 'master' Allow gitlab-project's fork-project command to fork projects between different repository storages Closes #51 See merge request !75
| * Allow gitlab-project's fork-project command to fork projects between ↵Alejandro Rodríguez2016-07-263-8/+43
|/ | | | different repository storages
* Merge branch 'remove-env-set' into 'master' Robert Speicher2016-07-213-10/+4
|\ | | | | | | | | | | | | | | | | Unset GL_ID and GL_PROTOCOL immediately Neither other code executing in the hook process nor subprocesses of the hook process need access to the GL_ID / GL_PROTOCOL variables so we can just unset them the moment we fetch them. See merge request !73
| * Remove spaceremove-env-setJacob Vosmaer2016-07-201-1/+1
| |
| * More ENV.deleteJacob Vosmaer2016-07-201-1/+1
| |
| * Unset GL_ID and GL_PROTOCOL immediatelyJacob Vosmaer2016-07-202-9/+3
|/ | | | | | Neither other code executing in the hook process nor subprocesses of the hook process need access to the GL_ID / GL_PROTOCOL variables so we can just unset them the moment we fetch them.
* Merge branch '48-regression-in-v3-1-0-vs-v3-0-0' into 'master' v3.2.0Stan Hu2016-07-062-0/+2
|\ | | | | | | | | | | | | Add an error message when using shell commands with incompatible GitLab versions Closes #48 See merge request !70
| * Add an error message when using shell commands with incompatible GitLab versionsAlejandro Rodríguez2016-07-062-0/+2
|/
* Merge branch 'add-allowed-protocols-support' into 'master' Douwe Maan2016-07-0611-17/+150
|\ | | | | | | | | | | | | Allow GitLab Shell to check for allowed access based on the used Git protocol. Needed for gitlab-org/gitlab-ce!4696 and gitlab-org/gitlab-ce#18601 See merge request !62
| * Bump VERSION to 3.2.0add-allowed-protocols-supportPatricio Cano2016-07-052-2/+4
| |
| * Make use of a constant for the used SSH protocolPatricio Cano2016-07-051-2/+3
| |
| * Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] and make it mandatory with no ↵Patricio Cano2016-07-055-11/+11
| | | | | | | | fallback value
| * Added better tests for the protocol checkPatricio Cano2016-07-054-1/+126
| |
| * Simplify protocol assign, and populate ENV['PROTOCOL'] variable when calling ↵Patricio Cano2016-07-053-5/+4
| | | | | | | | hooks via SSH
| * Added CHANGELOG itemPatricio Cano2016-07-051-0/+1
| |
| * Allow GitLab Shell to check for allowed access based on the used Git protocol.Patricio Cano2016-07-054-6/+11
|/
* Merge branch 'remove-hound-config' into 'master' Stan Hu2016-07-051-3/+0
|\ | | | | | | | | | | | | Remove hound config Since we moved to gitlab.com we don't use Hound CI anymore. Instead we have rubocop. See merge request !69
| * Remove hound configremove-hound-configRobert Schilling2016-07-051-3/+0
|/
View Lorry Controller Status