summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * Run go build/test in CI with 1.9 and 1.10Jacob Vosmaer2018-06-201-2/+6
|/
* Merge branch '138-fix-pre-receive-hook' into 'master'Douwe Maan2018-06-131-1/+1
|\ | | | | | | | | | | | | Resolve "NoMethodError for nil in pre-receive hook" Closes #138 See merge request gitlab-org/gitlab-shell!206
| * Fix a NoMethodError in the pre-receive hookNick Thomas2018-06-121-1/+1
|/
* Merge branch 'winh-makes-it-2018' into 'master'Robert Speicher2018-06-111-1/+1
|\ | | | | | | | | | | | | Update LICENSE year to 2018 [ci skip] See merge request gitlab-org/gitlab-shell!205
| * Update LICENSE year to 2018Winnie Hellmann2018-06-111-1/+1
|/
* Merge branch 'issue-29006' into 'master'v7.1.4Douwe Maan2018-06-044-5/+149
|\ | | | | | | | | allow long strings to remain intact while parsing broadcast message See merge request gitlab-org/gitlab-shell!202
| * allow long strings to remain intact while parsing broadcast messageCameron Crockett2018-06-014-5/+149
|/ | | | | | | | | | | | | | Added fix for msg nil edge case. fixed comment wording code review issues, bumped version and changelog entry Fixed rebase issues Moved strip out of the function Fixes for code review comments Removed trailing whitespaces
* Merge branch 'bvl-display-username-instead-of-fullname' into 'master'v7.1.3Douwe Maan2018-05-284-9/+18
|\ | | | | | | | | | | | | Display the username instead of fullname Closes #131 See merge request gitlab-org/gitlab-shell!204
| * Bump version to 7.1.3bvl-display-username-instead-of-fullnameBob Van Landuyt2018-05-243-2/+11
| |
| * Display the username instead of fullnameBob Van Landuyt2018-05-233-8/+8
|/ | | | | | | | When running `ssh git@gitlab.example.com` we used to reply with the full name. But it might actually be more useful to display the username. This is unique and can help support identifying issues. Closes #131
* Merge branch 'setup_security_products' into 'master'Rémy Coutable2018-04-111-11/+45
|\ | | | | | | | | Setup security products. See merge request gitlab-org/gitlab-shell!201
| * Setup security products.Olivier Gonzalez2018-04-111-11/+45
|/
* Merge branch 'logger-error' into 'master'v7.1.2Douwe Maan2018-04-094-2/+28
|\ | | | | | | | | | | | | Add missing GitlabLogger#error method Closes #130 See merge request gitlab-org/gitlab-shell!200
| * Add missing GitlabLogger#error methodJacob Vosmaer (GitLab)2018-04-094-2/+28
|/
* Merge branch 'log-flush' into 'master'v7.1.1Douwe Maan2018-03-235-1/+32
|\ | | | | | | | | Flush log file after every write See merge request gitlab-org/gitlab-shell!199
| * Flush log file after every writeJacob Vosmaer (GitLab)2018-03-235-1/+32
|/
* Release v7.1.0v7.1.0Sean McGivern2018-03-211-1/+1
|
* Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-2122-666/+2457
|\ | | | | | | | | Add Gitaly git-upload-archive migrated command See merge request gitlab-org/gitlab-shell!192
| * Add Gitaly git-upload-archive migrated commandgitaly-upload-archiveAlejandro Rodríguez2018-03-2022-666/+2457
|/
* Merge branch 'structured-logging' into 'master'v7.0.0Douwe Maan2018-03-1917-79/+323
|\ | | | | | | | | Switch to structured logging See merge request gitlab-org/gitlab-shell!193
| * Switch to structured loggingJacob Vosmaer (GitLab)2018-03-1917-79/+323
|/
* Merge branch 'add-logrus' into 'master'Nick Thomas2018-03-13266-0/+153518
|\ | | | | | | | | Vendor logrus at v1.0.5 See merge request gitlab-org/gitlab-shell!197
| * Vendor logrus at v1.0.5add-logrusJacob Vosmaer2018-03-13266-0/+153518
|/
* Merge branch 'fix-tests' into 'master'Nick Thomas2018-03-132-12/+22
|\ | | | | | | | | Fix tests that fail locally See merge request gitlab-org/gitlab-shell!196
| * Fix tests that fail locallyJacob Vosmaer (GitLab)2018-03-132-12/+22
|/
* Merge branch 'remove-rsync' into 'master'Robert Speicher2018-03-121-2/+0
|\ | | | | | | | | Remove rsync from test setup See merge request gitlab-org/gitlab-shell!195
| * Remove rsync from test setupJacob Vosmaer2018-03-121-2/+0
| |
* | Merge branch 'remove-.rspec' into 'master'Robert Speicher2018-03-122-4/+3
|\ \ | |/ |/| | | | | Don't force color via .rspec See merge request gitlab-org/gitlab-shell!194
| * Don't force color via .rspecJacob Vosmaer2018-03-122-4/+3
|/
* Release v6.0.4v6.0.4Sean McGivern2018-03-061-1/+1
|
* Add changelog entry for !191Robert Speicher2018-03-011-0/+3
| | | | [ci skip]
* Merge branch 'patch-2' into 'master'Robert Speicher2018-03-011-1/+1
|\ | | | | | | | | | | | | Don't delete GL_REPOSITORY Closes #125 See merge request gitlab-org/gitlab-shell!191
| * Don't delete GL_REPOSITORYBen2018-02-241-1/+1
|/
* Merge branch 'dz-update-deps' into 'master'Robert Speicher2018-02-2215-1024/+131
|\ | | | | | | | | Update rubocop See merge request gitlab-org/gitlab-shell!190
| * Remove files that are not used in the projectDmitriy Zaporozhets2018-02-221-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update files to pass modern rubocop checks. Disable some of themdz-update-depsDmitriy Zaporozhets2018-02-2212-971/+93
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update rubocop and code to pass itDmitriy Zaporozhets2018-02-229-48/+38
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update dev dependencies with security issuesDmitriy Zaporozhets2018-02-222-16/+19
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'print-new-project-in-post-receive' into 'master'v6.0.3Douwe Maan2018-02-064-20/+31
|\ | | | | | | | | Print new project information in post receive See merge request gitlab-org/gitlab-shell!186
| * Adds changelog item and bumps the versionTiago Botelho2018-02-063-46/+8
| |
| * Print new project information in post receiveTiago Botelho2018-02-062-5/+54
|/
* Merge branch 'dz-add-sast' into 'master'Robert Speicher2018-02-051-0/+8
|\ | | | | | | | | Add SAST job to .gitlab-ci.yml See merge request gitlab-org/gitlab-shell!188
| * Reset before_script for SAST jobdz-add-sastDmitriy Zaporozhets2018-02-051-0/+1
| |
| * Remove unnecessary newline in .gitlab-ci.yml [ci skip]Dmitriy Zaporozhets2018-02-051-1/+0
| |
| * Add SAST job to .gitlab-ci.ymlDmitriy Zaporozhets2018-02-051-0/+8
| |
* | Merge branch 'dz-remove-coveralls' into 'master'Robert Speicher2018-02-054-26/+9
|\ \ | |/ |/| | | | | Replace coveralls with simplecov See merge request gitlab-org/gitlab-shell!189
| * Replace coveralls with simplecovdz-remove-coverallsDmitriy Zaporozhets2018-02-054-26/+9
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update LICENSE in line with ↵Douwe Maan2018-01-221-1/+6
| | | | https://about.gitlab.com/handbook/engineering/#gitlab-repositories
* Update CONTRIBUTING.md in line with ↵Douwe Maan2018-01-221-5/+10
| | | | https://about.gitlab.com/handbook/engineering/#gitlab-repositories
* Merge branch 'changelog-6.0.2' into 'master'v6.0.2Robert Speicher2018-01-192-1/+5
|\ | | | | | | | | Add CHANGELOG for 6.0.2 See merge request gitlab-org/gitlab-shell!187