summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use full repository path for API calls instead of extracting namedz-support-nested-namespacesDmitriy Zaporozhets2016-10-278-30/+16
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'remove_lfs_remark' into 'master' Marin Jankovski2016-10-131-26/+1
|\ | | | | | | | | Git LFS remark in readme is no longer correct. See merge request !101
| * Git LFS remark in readme is no longer correct.remove_lfs_remarkMarin Jankovski2016-10-121-26/+1
| |
* | Release 3.6.6v3.6.6Yorick Peterse2016-10-121-1/+1
| |
* | Merge branch 'reuse-logger' into 'master' Marin Jankovski2016-10-123-10/+10
|\ \ | |/ |/| | | | | | | | | Re-use the default logger for performance metrics See #64 for the discussion leading up to this. See merge request !100
| * Re-use the default logger for performance metricsYorick Peterse2016-10-123-10/+10
|/ | | | | | | This removes the need for configuring anything extra. To make scraping easier each line is prefixed by "metrics:". Fixes #64
* Release 3.6.5v3.6.5Yorick Peterse2016-10-111-1/+1
|
* Merge branch '62-instrument-gitlab-shell' into 'master' Yorick Peterse2016-10-119-37/+158
|\ | | | | | | | | Instrument GitLab Shell and log metrics data to a file See merge request !98
| * Instrument GitLab Shell and log metrics data to a filePaco Guzman2016-10-119-37/+158
|/
* Merge branch '61-ruby-23' into 'master' Sean McGivern2016-10-102-7/+10
|\ | | | | | | | | | | | | Test against ruby 2.3 Closes #61 See merge request !99
| * Test against ruby 2.3Paco Guzman2016-10-102-7/+10
|/
* Release 3.6.4v3.6.4Yorick Peterse2016-10-071-1/+1
|
* Merge branch 'fix-ionice-again' into 'master' Yorick Peterse2016-10-073-9/+11
|\ | | | | | | | | Fix rsync with ionice command building See merge request !97
| * Fix rsync with ionice command buildingAlejandro Rodríguez2016-10-073-9/+11
|/
* Merge branch 'fix-ionice' into 'master' Yorick Peterse2016-10-053-1/+41
|\ | | | | | | | | Fix short circuit logic between rsync with and without ionice for storage migrations See merge request !96
| * Fix short circuit logic between rsync with and without ionice forAlejandro Rodríguez2016-10-053-1/+41
|/ | | | storage migrations
* Merge branch 'add_gl_id' into 'master' Sean McGivern2016-10-057-7/+52
|\ | | | | | | | | | | | | | | Re-exposing GL_ID to custom hooks closes https://gitlab.com/gitlab-org/gitlab-ee/issues/995 closes https://gitlab.com/gitlab-org/gitlab-shell/issues/53 See merge request !95
| * added GL_IDadd_gl_idValery Sizov2016-10-057-7/+52
| |
* | Merge branch 'bump-version-3.6.2' into 'master' v3.6.3Rémy Coutable2016-09-301-1/+1
|\ \ | |/ |/| | | | | | | | | Update VERSION Was this an oversight? Should we re-tag v3.6.2? Or just bump to v3.6.3? See merge request !94
| * Update VERSION to 3.6.3 since 3.6.2 was already taggedLin Jen-Shin (godfat)2016-09-301-1/+1
| |
| * 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
View Lorry Controller Status