summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Correctly restore empty repositories.Dimitry Andric2014-11-131-1/+7
| | | | | | If a project is being restored, but there is no bundle file, the project was empty when it was backed up. In this case, just use git init --base to create a new bare repository.
* Merge pull request #8291 from MrMarvin/fix/ldap_cleanup_taskJacob Vosmaer2014-11-121-2/+2
|\ | | | | fixes the `block_removed_ldap_users` rake task
| * fixes the `block_removed_ldap_users` rake taskMarvin Frick2014-11-121-2/+2
| | | | | | | | | | | | | | | | | | In e23a26a (and later 1bc9936) the API for Gitlab::LDAP::Adapter was changed. I assume this rake task was an oversight in the refactoring of the changed class. While being on it, I noticed that already blocked users cannot be blocked again.
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2014-11-122-0/+11
|\ \
| * \ Merge remote-tracking branch 'origin/master' into backup_restore_drop_sequencesValery Sizov2014-11-1216-53/+124
| |\ \ | | |/ | | | | | | | | | Conflicts: CHANGELOG
| * | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ↵Jacob Vosmaer2014-10-305-52/+90
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | backup_restore_drop_sequences Conflicts: CHANGELOG
| * | | Drop all Postgres sequences during backup restoreJacob Vosmaer2014-10-282-0/+11
| | | |
* | | | Merge branch 'commit-comments' of https://gitlab.com/jeroenj/gitlab-ce into ↵Dmitriy Zaporozhets2014-11-122-0/+69
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | jeroenj/gitlab-ce-commit-comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | | Adds comments to commits in the APIJeroen Jacobs2014-09-262-0/+69
| | | |
* | | | Revert "Create dev fixture projects with fixed visibility"Dmitriy Zaporozhets2014-11-101-5/+1
| | | | | | | | | | | | | | | | This reverts commit a9fadce361163e97eb1de0ec62e4235ff0fa3daa.
* | | | Merge pull request #8273 from bbodenmiller/nginx-updatesMarin Jankovski2014-11-102-16/+15
|\ \ \ \ | | | | | | | | | | Nginx updates
| * | | | minor updates & formatting changesBen Bodenmiller2014-11-082-16/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor updates @ formatting changes to match other versions of file. Unify formatting of https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab, https://github.com/gitlabhq/gitlabhq/blob/master/lib/support/nginx/gitlab-ssl, & https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-cookbooks/gitlab/templates/default/nginx-gitlab-http.conf.erb
* | | | Merge pull request #8254 from cirosantilli/factor-get-shell-versionDmitriy Zaporozhets2014-11-083-8/+11
|\ \ \ \ | | | | | | | | | | Factor GITLAB_SHELL_VERSION get method
| * | | | 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. I came across this issue when initially setting up gitlab and fixed it locally. Today, helping someone else set up their own instance, I came across this issue again: The sample nginx configuration files disable IPv6 by default, making the server inaccesible unless the remote node has native IPv4. IPv4->IPv6 transition mechanisms don't help if the server have proper IPv6 DNS records in-place, which was the case for both of my servers. This branch enables IPv4 and IPv6 by default. Older servers with no external IPv6 connectivity will not fail since they'll have a local-link IPv6 address to bind to anyway. See merge request !231
| * | | | | Don't enable IPv4 *only* on nginx.Hugo Osvaldo Barrera2014-11-032-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current configuration sample files only enable IPv4 by default, making the server inaccesible for many remote hosts (and an increasing amount every day). Enable IPv4 and IPv6 by default. Older servers with no external IPv6 connectivity will not fail since they'll have a local-link IPv6 address to bind to anyway.
* | | | | | Merge pull request #8168 from cirosantilli/dev-fixtures-visibilityMarin Jankovski2014-11-071-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Create dev fixture projects with fixed visibility
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b33d4bc2f1d26ee3526b9d7f530f468a9d5b5a5e.
* | | | | | | Revert "Don't output to stdout from lib non-interactive methods"Valery Sizov2014-11-063-40/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0b1084a4538bc46684c8620410988d3b1093e7ab.
* | | | | | | 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 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
| | | | | | |
View Lorry Controller Status