Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5993 from DarkHorseComics/bypass-commented-sqlite | Jacob Vosmaer | 2014-03-18 | 1 | -0/+1 |
|\ | |||||
| * | Add more descriptive line for resolving sqlite error during check | Jamey J. DeOrio | 2014-03-17 | 1 | -0/+1 |
* | | Merge branch 'check_orphaned_users_groups' into 'master' | Dmitriy Zaporozhets | 2014-03-18 | 1 | -0/+14 |
|\ \ | |/ |/| | |||||
| * | Drop UsersGroup orphans using `rails runner` | Jacob Vosmaer | 2014-03-17 | 1 | -0/+4 |
| * | Add check for orphaned UsersGroups | Jacob Vosmaer | 2014-03-14 | 1 | -0/+10 |
* | | Merge branch 'links_within_same_repo' into 'master' | Dmitriy Zaporozhets | 2014-03-17 | 1 | -2/+4 |
|\ \ | |||||
| * | | Wiki will show relative links related to the wiki gollum repository. | Marin Jankovski | 2014-03-17 | 1 | -2/+4 |
* | | | Fix tests | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
* | | | Add tests for API project permissions info | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+3 |
* | | | Remove old entities | Dmitriy Zaporozhets | 2014-03-17 | 1 | -12/+0 |
* | | | Add current user permissions info to /api/projects/:id.json | Dmitriy Zaporozhets | 2014-03-17 | 2 | -2/+24 |
* | | | Move project members api to separate file | Dmitriy Zaporozhets | 2014-03-17 | 4 | -114/+115 |
* | | | Merge pull request #6534 from dlorch/master | Dmitriy Zaporozhets | 2014-03-17 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | JIRA project identifiers may also contain dashes '-' | Daniel Lorch | 2014-03-14 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessn... | Dmitriy Zaporozhets | 2014-03-16 | 1 | -2/+4 |
|\ \ | |||||
| * | | Added description parameter support to Create and Update MR API endpoints (is... | Greg Messner | 2014-03-03 | 1 | -2/+4 |
* | | | Improve developer seeds | Dmitriy Zaporozhets | 2014-03-15 | 2 | -3/+22 |
* | | | Merge branch 'batch_key_import' into 'master' | Dmitriy Zaporozhets | 2014-03-15 | 3 | -5/+25 |
|\ \ \ | |||||
| * | | | Batch key import requires gitlab-shell 1.8.5 | Jacob Vosmaer | 2014-03-14 | 1 | -1/+1 |
| * | | | Use batch_add_keys in `rake gitlab:shell:setup` | Jacob Vosmaer | 2014-03-14 | 2 | -4/+24 |
| | |/ | |/| | |||||
* | | | Change project lookup order for api | Dmitriy Zaporozhets | 2014-03-14 | 1 | -1/+1 |
|/ / | |||||
* | | Clear rake task only if defined | Dmitriy Zaporozhets | 2014-03-14 | 2 | -2/+2 |
* | | Merge branch 'ldap_connections' | Dmitriy Zaporozhets | 2014-03-14 | 3 | -8/+36 |
|\ \ | |||||
| * | | Add Gitlab::LDAP::Access.open | Jacob Vosmaer | 2014-03-14 | 1 | -1/+13 |
| * | | Add Gitlab::LDAP::Adapter.open | Jacob Vosmaer | 2014-03-14 | 1 | -3/+17 |
| * | | Allow passing an adapter to Gitlab::LDAP::Person | Jacob Vosmaer | 2014-03-14 | 1 | -4/+6 |
* | | | Require gitlab-shell v1.8.4 | Dmitriy Zaporozhets | 2014-03-14 | 1 | -1/+1 |
* | | | Fix project creation test | Dmitriy Zaporozhets | 2014-03-14 | 1 | -1/+0 |
* | | | Override rake test | Dmitriy Zaporozhets | 2014-03-14 | 1 | -0/+7 |
* | | | Override rake spec and rake spinach tasks | Dmitriy Zaporozhets | 2014-03-14 | 3 | -1/+28 |
|/ / | |||||
* | | Merge pull request #6360 from jvanbaarsen/fix-6328-expose-username | Dmitriy Zaporozhets | 2014-03-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | Also expose username for the /discover endpoint | Jeroen van Baarsen | 2014-02-20 | 1 | -1/+1 |
* | | | Merge branch 'tighten_logrotate' into 'master' | Dmitriy Zaporozhets | 2014-03-13 | 1 | -6/+4 |
|\ \ \ | |||||
| * | | | Logrotate daily, keeping 90 days of old logs | Jacob Vosmaer | 2014-03-12 | 1 | -6/+4 |
* | | | | Use gitlab:setup inside gitlab:test | Dmitriy Zaporozhets | 2014-03-13 | 1 | -3/+2 |
* | | | | Add mysql limits to db during setup | Dmitriy Zaporozhets | 2014-03-13 | 2 | -0/+9 |
|/ / / | |||||
* | | | Changed limits to a higher order | Jeroen van Baarsen | 2014-03-12 | 1 | -3/+3 |
* | | | Added rake task to add limits back in mysql | Jeroen van Baarsen | 2014-03-11 | 1 | -0/+13 |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge pull request #6478 from infoMantisGmbH/master | Dmitriy Zaporozhets | 2014-03-11 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Allow underscore as the first char for project names. | mk | 2014-03-06 | 1 | -2/+2 |
* | | | | | Merge branch 'ldap-code' into 'master' | Dmitriy Zaporozhets | 2014-03-11 | 5 | -14/+157 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add ldap check in application_controller and internal api | Dmitriy Zaporozhets | 2014-03-10 | 1 | -1/+7 |
| * | | | | Remove copyright | Dmitriy Zaporozhets | 2014-03-10 | 3 | -18/+0 |
| * | | | | Port LDAP code from EE | Dmitriy Zaporozhets | 2014-03-10 | 4 | -13/+168 |
* | | | | | Merge branch 'catch_missing_command' into 'master' | Dmitriy Zaporozhets | 2014-03-10 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Catch missing commands in rake tasks with '' | Jacob Vosmaer | 2014-03-10 | 1 | -0/+2 |
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-03-10 | 1 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #6492 from tsigo/gitlab-shell-custom-path | Dmitriy Zaporozhets | 2014-03-10 | 1 | -4/+4 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | Respect custom gitlab_shell path in gitlab:gitlab_shell:check task | Robert Speicher | 2014-03-07 | 1 | -4/+4 |
| | | |/ / / | | |/| | | |