summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update VERSIONbump-version-3.6.2Lin Jen-Shin (godfat)2016-09-301-1/+1
|
* Merge branch '59-git-tracing' into 'master' v3.6.2Rémy Coutable2016-09-275-1/+107
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable GIT_TRACE_PERFORMANCE through a config variable. The value of the variable must an absolute path needs to exist so we’re able to check if we can write in that file. Because in the case we cannot write we’ll throw a warning to the output of the users. ```sh ~/dev/gitlab/local/pacoguzman/gitlab-ce (master=)$ git push origin master warning: could not open '/wadus' for tracing: Permission denied Everything up-to-date ``` Closes #59 See merge request !91
| * Enable GIT_TRACE/GIT_TRACE_PACKET/GIT_TRACE_PERFORMANCE by providing the ↵59-git-tracingPaco Guzman2016-09-275-1/+107
|/ | | | | | git_trace_log_file config key The value of the variable if present must be a writable absolute path. If it’s not the case we log a proper message and not enable tracing to not throw output to the users.
* Version 3.6.1v3.6.1Douwe Maan2016-09-261-1/+1
|
* Merge branch 'ionice-mv' into 'master' Yorick Peterse2016-09-233-1/+17
|\ | | | | | | | | Set a low IO priority for storage moves to lower performance impact See merge request !92
| * Set a low IO priority for storage moves to lower performance impactionice-mvAlejandro Rodríguez2016-09-203-1/+17
|/
* Bump version to 3.6.0v3.6.0Douwe Maan2016-09-202-2/+4
|
* Merge branch 'lfs-authenticate-support' into 'master' Douwe Maan2016-09-208-5/+191
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LFS support to SSH Required changes to GitLab Shell include the actual handling of the `git-lfs-authenticate` command and the retrieval of the correct credentials. Needed for gitlab-org/gitlab-ce!6043 Related to gitlab-org/gitlab-ce#3589 > **Note:** gitlab-org/gitlab-ce!6043 needs to be merged before this one. cc @jacobvosmaer-gitlab @marin @DouweM See merge request !86
| * Properly rescue from JSON parse.lfs-authenticate-supportPatricio Cano2016-09-081-2/+6
| |
| * Style fixes and better tests.Patricio Cano2016-09-064-10/+25
| |
| * Refactored LFS auth logic to use its own API endpoint.Patricio Cano2016-09-0611-28/+107
| |
| * Added test for old Git LFS clients that submit an extra :oid argument to ↵Patricio Cano2016-09-061-0/+13
| | | | | | | | `git-lfs-authenticate`
| * Refactored JSON header generation to its own class and added tests for itPatricio Cano2016-09-063-10/+45
| |
| * Added LFS support to SSHPatricio Cano2016-09-069-10/+50
|/ | | | - Required changes to GitLab Shell include the actual handling of the `git-lfs-authenticate` command and the retrieval of the correct credentials.
* Version 3.5.0v3.5.0Douwe Maan2016-09-021-1/+1
|
* Merge branch '2fa_recovery' into 'master' Douwe Maan2016-09-027-12/+224
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add option to recover 2FA via SSH Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/3765 Allow users to recover their own account if they lose their 2FA device or recovery codes. ## Questions/Concerns - Does this look secure? I think it is but we need to make sure no one can spoof a username or something and disable two factor. ## Todo - [x] Working code - [x] Tests - [x] GitLab merge requests (including documentation) ![Screen_Shot_2016-08-18_at_2.34.18_PM](/uploads/1ed00e93abdfc3b41187c021e4f9d4db/Screen_Shot_2016-08-18_at_2.34.18_PM.png) See merge request !74
| * Add option to recover 2FA via SSHDrew Blessing2016-08-267-12/+224
|/
* 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
View Lorry Controller Status