summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Improve broadcast message logicv2.5.1Dmitriy Zaporozhets2015-02-186-13/+14
| | | | | | | | | | Expect broadcast message API endpoint to return 200 with empty JSON if no broadcast messages available
* | Bump versionv2.5.0Dmitriy Zaporozhets2015-02-161-1/+1
| |
* | Merge branch 'git-annex-fix' into 'master'Dmitriy Zaporozhets2015-02-171-2/+2
|\ \ | | | | | | | | | | | | | | | Git annex fix See merge request !58
| * | Fix syntax of git init commandDmitriy Zaporozhets2015-02-171-1/+1
| | |
| * | Fix git-annex init repoDmitriy Zaporozhets2015-02-171-3/+3
|/ /
* | Update CHANGELOGDmitriy Zaporozhets2015-02-161-0/+1
| |
* | Make fixes to pass rubocopDmitriy Zaporozhets2015-02-164-11/+10
| |
* | Add rubocop to gitlab-shellDmitriy Zaporozhets2015-02-163-0/+985
| |
* | Merge branch 'git-annex-disabled' into 'master'Dmitriy Zaporozhets2015-02-164-4/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | Git annex disabled by default cc @sytse See merge request !57
| * | Disable git-annex by defaultDmitriy Zaporozhets2015-02-164-4/+10
|/ /
* | Merge branch 'git-annex' into 'master'Dmitriy Zaporozhets2015-02-166-32/+123
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git annex support - [x] fix auth for git-annex - [x] enable git-annex for repository on first annex call - [x] config option to disable it - [x] write tests See merge request !55
| * | Add more git-annex testsDmitriy Zaporozhets2015-02-161-1/+9
| | |
| * | Add config option to disable git-annexDmitriy Zaporozhets2015-02-163-4/+13
| | |
| * | Enable git-annex on first commandDmitriy Zaporozhets2015-02-133-38/+72
| | |
| * | Improve logging for git-annexDmitriy Zaporozhets2015-02-121-1/+4
| | |
| * | Bump versionDmitriy Zaporozhets2015-02-122-1/+4
| | |
| * | Merge branch 'master' into git-annexDmitriy Zaporozhets2015-02-128-75/+171
| |\ \ | |/ / |/| | | | | | | | Conflicts: lib/gitlab_shell.rb
* | | Merge branch 'log-api-error' into 'master'Dmitriy Zaporozhets2015-02-123-7/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | Log full Net::HTTP error. See merge request !56
| * | | Log full Net::HTTP error.Douwe Maan2015-02-123-7/+2
|/ / /
* | | Merge branch 'internal-api-unavailable' into 'master'Dmitriy Zaporozhets2015-02-128-72/+175
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show nice error message when internal API is unreachable. Closes #27. Error message reads "Failed to authorize your Git request: internal API unreachable". See merge request !54
| * | | Show nice error message when internal API is unreachable.Douwe Maan2015-02-118-32/+134
| | | |
| * | | Refactor: Remove #tap for readability and performance and DRY up get/post.Douwe Maan2015-02-112-41/+42
|/ / /
| * | Enable git-annex validate accessGitLab2015-02-122-6/+10
| | |
| * | Patch gitlab-shell to work with git-annex-shellDmitriy Zaporozhets2015-02-111-6/+38
|/ /
* | Bump versionv2.4.3Dmitriy Zaporozhets2015-02-101-1/+1
| |
* | Merge branch 'broadcast-message' into 'master'Dmitriy Zaporozhets2015-02-107-0/+152
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Print broadcast message if one is available See gitlab/gitlab-ee#241. Uses gitlab/gitlabhq!1486. Text is centered automatically: ``` ================================================================================ Maintenance window planned from 7AM to 9AM PST. ================================================================================ ``` Longer text is wrapped automatically: ``` ================================================================================ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur mi ac risus dapibus, sed rutrum eros elementum. Nunc id elit justo. Duis sagittis, orci quis fringilla tempus, odio ipsum convallis mauris, in porta quam nisi ac ante. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Sed sit amet blandit diam. Quisque euismod dolor in ligula euismod aliquet in non libero. Aenean gravida ac augue vel laoreet. Phasellus vitae dictum tellus. In euismod dui sed odio tempus, eget lacinia ante fermentum. Nullam lacinia bibendum sollicitudin. Aenean et consequat felis. Curabitur libero orci, varius ac ultrices laoreet, blandit eu neque. Nullam eget semper nunc, id porta lorem. Phasellus at bibendum lorem, vitae sodales arcu. ================================================================================ ``` Existing linebreaks are respected: ``` ================================================================================ Planned maintenance windows: February 8 7AM - 9AM February 9 7AM - 8AM ================================================================================ ``` See merge request !53
| * Print broadcast message if one is available.Douwe Maan2015-02-097-0/+152
|/
* Fix gitlab-shell access for any kind of branchv2.4.2Dmitriy Zaporozhets2015-01-281-1/+2
|
* Bump gitlab-shell versionDmitriy Zaporozhets2015-01-282-1/+4
|
* Join changes in GitlabNet libraryDmitriy Zaporozhets2015-01-281-1/+1
|
* Merge branch 'create_hooks_response' into 'master'Dmitriy Zaporozhets2015-01-201-1/+6
|\ | | | | | | | | | | | | | | Create hooks response Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/1900 See merge request !52
| * Return true if no action was needed during create_hooks. Log to logger ↵Marin Jankovski2015-01-161-1/+6
|/ | | | actions taken.
* Merge branch 'master' of github.com:gitlabhq/gitlab-shellv2.4.1Dmitriy Zaporozhets2015-01-131-1/+1
|\
| * Merge pull request #206 from nerdoc/patch-1Robert Schilling2015-01-021-1/+1
| |\ | | | | | | typo in message: "accesible" -> "accessible"
| | * double quotes to single quotesChristian González2015-01-021-1/+1
| | |
| | * typo in message: "accesible" -> "accessible"Christian González2015-01-011-1/+1
| |/
* | Merge branch 'github_importer' into 'master'Dmitriy Zaporozhets2015-01-133-1/+5
|\ \ | | | | | | | | | | | | | | | Github importer See merge request !51
| * | version bumpValery Sizov2015-01-132-1/+4
| | |
| * | masking access_token from url for loggingValery Sizov2015-01-131-0/+1
|/ /
* | Merge branch 'update_changelog' into 'master'Sytse Sijbrandij2014-12-151-1/+1
|\ \ | |/ |/| | | | | | | Update changelog See merge request !50
| * update changelogValery Sizov2014-12-151-1/+1
|/
* Merge pull request #197 from dblessing/fix/custom_hook_outputJacob Vosmaer2014-11-261-3/+3
|\ | | | | Fix custom hook output
| * Fix custom hook output and return valuesDrew Blessing2014-11-181-3/+3
| |
* | Merge branch 'require_in_gitlab_net' into 'master'v2.4.0Valery Sizov2014-11-251-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Add missing 'require_relative' in gitlab_net.rb Prevent 'uninitialized constant GitlabNet::GitAccessStatus'. See merge request !49
| * | Add missing 'require_relative' in gitlab_net.rbJacob Vosmaer2014-11-251-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this 'require' statement, you get the following error: ``` $ git ls-remote origin /home/git/gitlab-shell/lib/gitlab_net.rb:30:in `check_access': uninitialized constant GitlabNet::GitAccessStatus (NameError) from /home/git/gitlab-shell/lib/gitlab_shell.rb:63:in `validate_access' from /home/git/gitlab-shell/lib/gitlab_shell.rb:24:in `exec' from /home/git/gitlab-shell/bin/gitlab-shell:16:in `<main>' fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. ```
* | Merge branch 'git_messages' into 'master'Valery Sizov2014-11-2413-31/+62
|\ \ | | | | | | | | | | | | | | | | | | | | | Better git hook messages DZ already merged it but we had to revert it because of lack of time to deploy to dev. See merge request !48
| * | Revert "Revert "Merge branch 'git_hook_messages'""Valery Sizov2014-11-2413-31/+62
|/ / | | | | | | This reverts commit f8453da5868dd7a23d0f2f3da7a45e33c441d1db.
* | Revert "Merge branch 'git_hook_messages'"Jacob Vosmaer2014-11-2013-62/+31
| | | | | | | | | | | | | | | | | | | | At least the following things were broken: - missing require for 'gitlab_access_status' in lib/gitlab_net.rb - gitlabhq master internal API returns 'true' or 'false', gitlab-shell expects JSON This reverts commit 11311a95545f967a5736cd16ab5fc37f7e658519, reversing changes made to 45444597aef3e434571de2491934ae92357ad231.
* | Merge branch 'git_hook_messages'Dmitriy Zaporozhets2014-11-1913-31/+62
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: VERSION
| * | Show error message when git access is rejectedValery Sizov2014-11-1413-31/+62
| |/
View Lorry Controller Status