summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5993 from DarkHorseComics/bypass-commented-sqliteJacob Vosmaer2014-03-181-0/+1
|\
| * 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
|\ \ | |/ |/|
| * 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
|\ \
| * | Wiki will show relative links related to the wiki gollum repository.Marin Jankovski2014-03-171-2/+4
* | | Fix testsDmitriy Zaporozhets2014-03-171-1/+1
* | | Add tests for API project permissions infoDmitriy Zaporozhets2014-03-171-1/+3
* | | Remove old entitiesDmitriy Zaporozhets2014-03-171-12/+0
* | | Add current user permissions info to /api/projects/:id.jsonDmitriy Zaporozhets2014-03-172-2/+24
* | | Move project members api to separate fileDmitriy Zaporozhets2014-03-174-114/+115
* | | Merge pull request #6534 from dlorch/masterDmitriy Zaporozhets2014-03-171-1/+1
|\ \ \ | |/ / |/| |
| * | 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 gmessn...Dmitriy Zaporozhets2014-03-161-2/+4
|\ \
| * | Added description parameter support to Create and Update MR API endpoints (is...Greg Messner2014-03-031-2/+4
* | | Improve developer seedsDmitriy Zaporozhets2014-03-152-3/+22
* | | Merge branch 'batch_key_import' into 'master'Dmitriy Zaporozhets2014-03-153-5/+25
|\ \ \
| * | | 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
|/ /
* | Clear rake task only if definedDmitriy Zaporozhets2014-03-142-2/+2
* | Merge branch 'ldap_connections'Dmitriy Zaporozhets2014-03-143-8/+36
|\ \
| * | Add Gitlab::LDAP::Access.openJacob Vosmaer2014-03-141-1/+13
| * | Add Gitlab::LDAP::Adapter.openJacob Vosmaer2014-03-141-3/+17
| * | Allow passing an adapter to Gitlab::LDAP::PersonJacob Vosmaer2014-03-141-4/+6
* | | Require gitlab-shell v1.8.4Dmitriy Zaporozhets2014-03-141-1/+1
* | | Fix project creation testDmitriy Zaporozhets2014-03-141-1/+0
* | | Override rake testDmitriy Zaporozhets2014-03-141-0/+7
* | | Override rake spec and rake spinach tasksDmitriy Zaporozhets2014-03-143-1/+28
|/ /
* | Merge pull request #6360 from jvanbaarsen/fix-6328-expose-usernameDmitriy Zaporozhets2014-03-131-1/+1
|\ \
| * | Also expose username for the /discover endpointJeroen van Baarsen2014-02-201-1/+1
* | | Merge branch 'tighten_logrotate' into 'master'Dmitriy Zaporozhets2014-03-131-6/+4
|\ \ \
| * | | Logrotate daily, keeping 90 days of old logsJacob Vosmaer2014-03-121-6/+4
* | | | Use gitlab:setup inside gitlab:testDmitriy Zaporozhets2014-03-131-3/+2
* | | | Add mysql limits to db during setupDmitriy Zaporozhets2014-03-132-0/+9
|/ / /
* | | 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.mk2014-03-061-2/+2
* | | | | Merge branch 'ldap-code' into 'master'Dmitriy Zaporozhets2014-03-115-14/+157
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add ldap check in application_controller and internal apiDmitriy Zaporozhets2014-03-101-1/+7
| * | | | Remove copyrightDmitriy Zaporozhets2014-03-103-18/+0
| * | | | Port LDAP code from EEDmitriy Zaporozhets2014-03-104-13/+168
* | | | | Merge branch 'catch_missing_command' into 'master'Dmitriy Zaporozhets2014-03-101-0/+2
|\ \ \ \ \
| * | | | | 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 taskRobert Speicher2014-03-071-4/+4
| | | |/ / / | | |/| | |