summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5993 from DarkHorseComics/bypass-commented-sqliteJacob Vosmaer2014-03-181-0/+1
|\ | | | | Explain what to do about legacy sqlite in database.yml
| * Add more descriptive line for resolving sqlite error during checkJamey J. DeOrio2014-03-171-0/+1
| |
* | Merge branch 'check_orphaned_users_groups' into 'master'Dmitriy Zaporozhets2014-03-181-0/+14
|\ \ | |/ |/| | | Check Orphaned Users Groups
| * Drop UsersGroup orphans using `rails runner`Jacob Vosmaer2014-03-171-0/+4
| |
| * Add check for orphaned UsersGroupsJacob Vosmaer2014-03-141-0/+10
| |
* | Merge branch 'links_within_same_repo' into 'master'Dmitriy Zaporozhets2014-03-171-2/+4
|\ \ | | | | | | | | | | | | | | | | | | Relative links within one system When using relative links in md in repository file it will only link within the repository. When using relative links in md in wiki page, it will only link to wiki pages.
| * | Wiki will show relative links related to the wiki gollum repository.Marin Jankovski2014-03-171-2/+4
| | |
* | | Fix testsDmitriy Zaporozhets2014-03-171-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add tests for API project permissions infoDmitriy Zaporozhets2014-03-171-1/+3
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Remove old entitiesDmitriy Zaporozhets2014-03-171-12/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Add current user permissions info to /api/projects/:id.jsonDmitriy Zaporozhets2014-03-172-2/+24
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Move project members api to separate fileDmitriy Zaporozhets2014-03-174-114/+115
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge pull request #6534 from dlorch/masterDmitriy Zaporozhets2014-03-171-1/+1
|\ \ \ | |/ / |/| | JIRA project identifiers may also contain dashes '-'
| * | JIRA project identifiers may also contain dashes '-'Daniel Lorch2014-03-141-1/+1
| |/
* | Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into ↵Dmitriy Zaporozhets2014-03-161-2/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | gmessner/gitlab-ce-issue-110 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Added description parameter support to Create and Update MR API endpoints ↵Greg Messner2014-03-031-2/+4
| | | | | | | | | | | | (issue-110).
* | | Improve developer seedsDmitriy Zaporozhets2014-03-152-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | Return execution of observers in seeds. Mute email sending to letter opening in you browser. Added `rake dev` task to reset db and add seeds. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'batch_key_import' into 'master'Dmitriy Zaporozhets2014-03-153-5/+25
|\ \ \ | | | | | | | | | | | | Batch Key Import
| * | | Batch key import requires gitlab-shell 1.8.5Jacob Vosmaer2014-03-141-1/+1
| | | |
| * | | Use batch_add_keys in `rake gitlab:shell:setup`Jacob Vosmaer2014-03-142-4/+24
| | |/ | |/|
* | | Change project lookup order for apiDmitriy Zaporozhets2014-03-141-1/+1
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Clear rake task only if definedDmitriy Zaporozhets2014-03-142-2/+2
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'ldap_connections'Dmitriy Zaporozhets2014-03-143-8/+36
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Add Gitlab::LDAP::Access.openJacob Vosmaer2014-03-141-1/+13
| | | | | | | | | | | | | | | This new method wraps Gitlab::LDAP::Adapter.open to enable connection reuse.
| * | Add Gitlab::LDAP::Adapter.openJacob Vosmaer2014-03-141-3/+17
| | | | | | | | | | | | | | | This new method is based on Net::LDAP.open, which reuses a single LDAP connection.
| * | Allow passing an adapter to Gitlab::LDAP::PersonJacob Vosmaer2014-03-141-4/+6
| | |
* | | Require gitlab-shell v1.8.4Dmitriy Zaporozhets2014-03-141-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix project creation testDmitriy Zaporozhets2014-03-141-1/+0
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Override rake testDmitriy Zaporozhets2014-03-141-0/+7
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Override rake spec and rake spinach tasksDmitriy Zaporozhets2014-03-143-1/+28
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge pull request #6360 from jvanbaarsen/fix-6328-expose-usernameDmitriy Zaporozhets2014-03-131-1/+1
|\ \ | | | | | | Also expose username for the /discover endpoint
| * | Also expose username for the /discover endpointJeroen van Baarsen2014-02-201-1/+1
| | | | | | | | | | | | Fixes #6328
* | | Merge branch 'tighten_logrotate' into 'master'Dmitriy Zaporozhets2014-03-131-6/+4
|\ \ \ | | | | | | | | | | | | Tighten Logrotate
| * | | Logrotate daily, keeping 90 days of old logsJacob Vosmaer2014-03-121-6/+4
| | | | | | | | | | | | | | | | | | | | Also remove the 'delaycompress' option which is not needed because we use 'copytruncate'.
* | | | Use gitlab:setup inside gitlab:testDmitriy Zaporozhets2014-03-131-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Add mysql limits to db during setupDmitriy Zaporozhets2014-03-132-0/+9
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Changed limits to a higher orderJeroen van Baarsen2014-03-121-3/+3
| | |
* | | Added rake task to add limits back in mysqlJeroen van Baarsen2014-03-111-0/+13
| | |
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-111-2/+2
|\ \ \
| * \ \ Merge pull request #6478 from infoMantisGmbH/masterDmitriy Zaporozhets2014-03-111-2/+2
| |\ \ \ | | | | | | | | | | Allow underscore as the first char for project names.
| | * | | Allow underscore as the first char for project names.mk2014-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
* | | | | Merge branch 'ldap-code' into 'master'Dmitriy Zaporozhets2014-03-115-14/+157
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | LDAP code from EE
| * | | | Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-101-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove copyrightDmitriy Zaporozhets2014-03-103-18/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Port LDAP code from EEDmitriy Zaporozhets2014-03-104-13/+168
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'catch_missing_command' into 'master'Dmitriy Zaporozhets2014-03-101-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Catch missing commands in Rake tasks
| * | | | | Catch missing commands in rake tasks with ''Jacob Vosmaer2014-03-101-0/+2
| | | | | |
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-101-4/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #6492 from tsigo/gitlab-shell-custom-pathDmitriy Zaporozhets2014-03-101-4/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
| | * | | | | Respect custom gitlab_shell path in gitlab:gitlab_shell:check taskRobert Speicher2014-03-071-4/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change, if I customized the config value of `gitlab.gitlab_shell.path`, the check would ignore this value in favor of `"~<gitlab.gitlab_shell.ssh_user>/gitlab-shell/"` resulting in a failed check when the configuration was otherwise valid.
View Lorry Controller Status