summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Revert "Create dev fixture projects with fixed visibility"Dmitriy Zaporozhets2014-11-101-5/+1
* Merge pull request #8273 from bbodenmiller/nginx-updatesMarin Jankovski2014-11-102-16/+15
|\
| * minor updates & formatting changesBen Bodenmiller2014-11-082-16/+15
* | Merge pull request #8254 from cirosantilli/factor-get-shell-versionDmitriy Zaporozhets2014-11-083-8/+11
|\ \
| * | Factor GITLAB_SHELL_VERSION get methodCiro Santilli2014-11-053-8/+11
* | | Merge branch 'nginx' into 'master'Marin Jankovski2014-11-072-3/+6
|\ \ \
| * | | Don't enable IPv4 *only* on nginx.Hugo Osvaldo Barrera2014-11-032-3/+6
* | | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibilityMarin Jankovski2014-11-071-1/+5
|\ \ \ \
| * | | | Create dev fixture projects with fixed visibilityCiro Santilli2014-10-261-1/+5
* | | | | fix system silent callValery Sizov2014-11-062-4/+3
* | | | | Revert "Revert "Don't output to stdout from lib non-interactive methods""Valery Sizov2014-11-063-14/+40
* | | | | Revert "Don't output to stdout from lib non-interactive methods"Valery Sizov2014-11-063-40/+14
* | | | | Factor using Repository#path_to_repoCiro Santilli2014-11-052-2/+2
| |_|/ / |/| | |
* | | | Merge pull request #8236 from cirosantilli/rm-lib-stdoutValeriy Sizov2014-11-053-14/+40
|\ \ \ \
| * | | | Don't output to stdout from lib non-interactive methodsCiro Santilli2014-11-053-14/+40
* | | | | Merge pull request #7516 from cirosantilli/update-regex-msgMarin Jankovski2014-11-051-2/+1
|\ \ \ \ \
| * | | | | 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.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 ifCiro Santilli2014-11-032-2/+7
| | |/ / / /
* | | | | | Merge branch 'master' into jastkand/gitlab-ce-fix-api-authDmitriy Zaporozhets2014-11-035-16/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'api-events-username' into 'master'Dmitriy Zaporozhets2014-11-031-0/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Expose author username in project events APIDmitriy Zaporozhets2014-10-311-0/+6
| * | | | | Merge pull request #8217 from bbodenmiller/change-label-generationRobert Schilling2014-11-011-1/+0
| |\ \ \ \ \
| | * | | | | remove feature labelBen Bodenmiller2014-10-311-1/+0
| | | |_|_|/ | | |/| | |
| * | | | | 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: render branch name json instead of trueDmitriy Zaporozhets2014-10-301-1/+4
| * | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-10-302-2/+22
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Create RepoTag Grape entity and present it when doing stuff with tags via API...Sean Edge2014-10-302-2/+22
* | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Dont allow guests..developers to manage group membersDmitriy Zaporozhets2014-10-291-2/+8
| * | | | Split group members apiDmitriy Zaporozhets2014-10-293-51/+75
* | | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | 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 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 splitCiro Santilli2014-10-231-2/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #8159 from cirosantilli/fix-rake-import-existing-groupJacob Vosmaer2014-10-241-10/+2
| |\ \ \ \ \
| | * | | | | Fix import.rake failed import if project name isCiro Santilli2014-10-241-10/+2
| * | | | | | 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/markdownCiro Santilli2014-10-231-1/+1
| | | |/ / / / | | |/| | | |