summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8236 from cirosantilli/rm-lib-stdoutValeriy Sizov2014-11-053-14/+40
|\ | | | | Don't output to stdout from lib non-interactive methods [failure unrelated]
| * Don't output to stdout from lib non-interactive methodsCiro Santilli2014-11-053-14/+40
| | | | | | | | It pollutes the test output too much.
* | Merge pull request #7516 from cirosantilli/update-regex-msgMarin Jankovski2014-11-051-2/+1
|\ \ | | | | | | Update default regex message to match regex.
| * | Update default regex message to match regex.Ciro Santilli2014-10-011-2/+1
| | |
* | | Merge pull request #8224 from liammonahan/masterValeriy Sizov2014-11-041-1/+2
|\ \ \ | | | | | | | | Expose projects_limit through users API if UserFull.
| * | | Expose projects_limit through users API if UserFull.Liam Monahan2014-11-021-1/+2
| | |/ | |/|
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-11-042-2/+7
|\ \ \
| * \ \ Merge pull request #8231 from cirosantilli/0000Dmitriy Zaporozhets2014-11-042-2/+7
| |\ \ \ | | | | | | | | | | Fix push not allowed to protected branch if commit starts with 7 zeros.
| | * | | Fix push not allowed to protected branch ifCiro Santilli2014-11-032-2/+7
| | |/ / | | | | | | | | | | | | commit starts with 7 zeros.
* | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-035-16/+52
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Merge branch 'api-events-username' into 'master'Dmitriy Zaporozhets2014-11-031-0/+6
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Expose author username in project events API Fixes gitlab/gitlabhq#1476 See merge request !1236
| | * | Expose author username in project events APIDmitriy Zaporozhets2014-10-311-0/+6
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge pull request #8217 from bbodenmiller/change-label-generationRobert Schilling2014-11-011-1/+0
| |\ \ \ | | | | | | | | | | remove feature label
| | * | | remove feature labelBen Bodenmiller2014-10-311-1/+0
| | | | | | | | | | | | | | | For automatic label generation remove label `feature` as it is basically means the same thing as label `enhancement`.
| * | | | Factor lib backend gitlab shell pathCiro Santilli2014-10-311-12/+20
| | |/ / | |/| |
| * | | Merge branch 'api-delete-branch-json' into 'master'Dmitriy Zaporozhets2014-10-311-1/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Api delete branch json Fixes gitlab/gitlabhq#1478 See merge request !1233
| | * | | API delete branch: render branch name json instead of trueDmitriy Zaporozhets2014-10-301-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-302-2/+22
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| | * | | Create RepoTag Grape entity and present it when doing stuff with tags via ↵Sean Edge2014-10-302-2/+22
| | | | | | | | | | | | | | | | | | | | API. Update API doc for repositories. Add tag message to tag list page in UI. Update Changelog. Update spec to set .gitconfig identity, required for annotated tags.
* | | | | Session API: Use case-insensitive authentication like in UIAndrey Krivko2014-10-301-1/+1
|/ / / /
* | | | Merge branch 'improve-group-members-api' into 'master'Valery Sizov2014-10-293-51/+81
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Improve group members api Related #1720 See merge request !1225
| * | | Dont allow guests..developers to manage group membersDmitriy Zaporozhets2014-10-291-2/+8
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Split group members apiDmitriy Zaporozhets2014-10-293-51/+75
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-10-288-40/+42
|\ \ \ \
| * \ \ \ Merge branch 'disable_email_option' into 'master'Dmitriy Zaporozhets2014-10-281-0/+8
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable email option Fixes #1569 See merge request !1222
| | * | | Add email interceptor to prevent mail sending if email sending is disabled.Marin Jankovski2014-10-271-0/+8
| | | | |
| * | | | Merge pull request #8005 from cirosantilli/settings-to-gitlab-configDmitriy Zaporozhets2014-10-272-4/+4
| |\ \ \ \ | | |/ / / | |/| | | Use Gitlab.config instead of Settings everywhere
| | * | | Use Gitlab.config instead of Settings everywhereCiro Santilli2014-10-152-4/+4
| | | | |
| * | | | Merge pull request #8158 from cirosantilli/basename-dirname-splitRobert Schilling2014-10-251-2/+1
| |\ \ \ \ | | | | | | | | | | | | Merge File basename and direname into split
| | * | | | Merge File basename and direname into splitCiro Santilli2014-10-231-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Faster because only does one split in that case.
| * | | | | Merge pull request #8159 from cirosantilli/fix-rake-import-existing-groupJacob Vosmaer2014-10-241-10/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix import.rake failed import if project name is also an existing namespace.
| | * | | | | Fix import.rake failed import if project name isCiro Santilli2014-10-241-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also an existing namespace. E.g., when trying to import group/root.git, that would fail if there is an user called root.
| * | | | | | Fix LDAP config lookup for provider 'ldap'Jacob Vosmaer2014-10-231-11/+16
| |/ / / / /
| * | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2014-10-231-2/+2
| |\ \ \ \ \
| | * | | | | Fix LDAP authentication for Git HTTP accessJacob Vosmaer2014-10-231-2/+2
| | | | | | |
| * | | | | | Merge pull request #8150 from cirosantilli/unecessary-variable-userRobert Schilling2014-10-231-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unused variable user at lib/gitlab/markdown
| | * | | | | | Remove unused variable user at lib/gitlab/markdownCiro Santilli2014-10-231-1/+1
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #8088 from cirosantilli/sh-str-to-argsJacob Vosmaer2014-10-231-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Use argument list for sh instead of string
| | * | | | | Use argument list for sh instead of stringCiro Santilli2014-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster, more portable and less error prone since no shell expansion.
| * | | | | | Merge pull request #8026 from HerrBerg/masterDmitriy Zaporozhets2014-10-221-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | rake:import:repos: fix exclude wiki regex for importing repositories
| | * | | | | | fix exclude wiki regexHerrBerg2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | the new regex allows importing repositories with repository name ending with wiki but still exclude gitlab wiki repositories
| * | | | | | | Merge pull request #8054 from bbodenmiller/patch-4Dmitriy Zaporozhets2014-10-221-8/+6
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | match latest config from https://cipherli.st/
| | * | | | | | match latest config from https://cipherli.st/Ben Bodenmiller2014-10-151-8/+6
| | | |_|_|/ / | | |/| | | |
* | | | | | | Merge branch 'api-project-delete' of https://gitlab.com/mr-vinn/gitlab-ce ↵Dmitriy Zaporozhets2014-10-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mr-vinn/gitlab-ce-api-project-delete Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
| * | | | | | Remove :keep_repo optionVinnie Okada2014-10-221-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always delete repositories from the filesystem when deleting a project.
| * | | | | | Add option to keep repo on project deleteVinnie Okada2014-10-071-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the project API controller to use `Projects::DestroyService` instead of calling `Project#destroy` directly. Also add an optional parameter, `:keep_repo`, that allows a project to be deleted without deleting the repository, wiki, and satellite from disk.
* | | | | | | Make gitlab ldap check work for old and new syntaxDmitriy Zaporozhets2014-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'fix-ldap-check' into 'master'Dmitriy Zaporozhets2014-10-222-31/+15
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ldap check Fixes gitlab/gitlabhq#1691 See merge request !1206
| * | | | | | Fix rake gitlab:ldap:checkDmitriy Zaporozhets2014-10-212-31/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge pull request #8117 from cirosantilli/improve-grack-commentRobert Schilling2014-10-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Improve grack auth hooks comment.
View Lorry Controller Status