summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* require gitlab-shell v1.2.0 nowDmitriy Zaporozhets2013-03-251-2/+2
* Merge branch 'fix-404-json-file' of https://github.com/hiroponz/gitlabhq into...Dmitriy Zaporozhets2013-03-241-19/+6
|\
| * Fix 404 error while displaying json files.Sato Hiroyuki2013-03-211-19/+6
* | Move directory logic out of model. Use Gitlab:Shell class to interact with fi...Dmitriy Zaporozhets2013-03-211-0/+59
* | replace Gitolited mixin with Gitlab::ShellAdapterDmitriy Zaporozhets2013-03-212-11/+12
|/
* Merge pull request #3247 from Undev/feature/fix_bug_in_team_assigmentDmitriy Zaporozhets2013-03-201-11/+13
|\
| * Add control of action in project to team assigmentAndrey Kumanyaev2013-03-181-10/+13
| * Fix bug with downgrade permissions on first project assigment to teamAndrey Kumanyaev2013-03-181-3/+2
* | Fix user path in markdownMartin Bastien2013-03-191-2/+2
* | Dont show blocked users in autocompleteDmitriy Zaporozhets2013-03-191-0/+1
* | add attachemnts support for wallDmitriy Zaporozhets2013-03-191-0/+1
* | load notes for wall via apiDmitriy Zaporozhets2013-03-191-0/+4
* | API docs updatedAlex Denisov2013-03-191-1/+1
* | Abilities added to /user and /sign_in requestsAlex Denisov2013-03-183-4/+8
|/
* Merge pull request #3242 from murank/fix_failure_of_checking_merge_requestsDmitriy Zaporozhets2013-03-181-1/+1
|\
| * Fix the order of clearing a satellitemurank2013-03-171-1/+1
* | Result of misspellings run.Kevin Lyda2013-03-173-4/+4
|/
* Fix Wiki migration task and add more test coverage.Dan Knox2013-03-162-6/+49
* Merge pull request #3217 from chrislawlor/2437Dmitriy Zaporozhets2013-03-161-1/+2
|\
| * Adds DB-sensitive tablename escape for backup task.Chris Lawlor2013-03-141-1/+2
* | Merge branch 'use_gollum_wikis' of https://github.com/DanKnox/gitlabhq into D...Dmitriy Zaporozhets2013-03-153-1/+132
|\ \ | |/ |/|
| * Create Wiki migration task.Dan Knox2013-03-102-0/+123
| * Replace current Wiki system with Gollum Wikis.Dan Knox2013-03-091-1/+9
* | add api users filter and integrate users select2Dmitriy Zaporozhets2013-03-131-1/+2
* | cleanup ProjectMoverDmitriy Zaporozhets2013-03-121-1/+1
* | check gitlab-shell version in gitlab:checkDmitriy Zaporozhets2013-03-121-0/+10
* | Use gitlab-shell to move repos. Requires gitlab-shell v1.1.0Dmitriy Zaporozhets2013-03-122-46/+13
* | Reduce amount of user info provided with internal apiDmitriy Zaporozhets2013-03-112-1/+5
* | Merge branch 'master' into api/system_hooks_adjustmentsSebastian Ziebell2013-03-071-0/+3
|\ \ | |/
| * Merge pull request #2835 from Asquera/fixes/apiDmitriy Zaporozhets2013-03-079-33/+142
| |\
| * | block user should not be able to pushDmitriy Zaporozhets2013-03-071-0/+3
* | | API: system hooks API functions and documentation updatedSebastian Ziebell2013-03-071-5/+15
| |/ |/|
* | API: fixes project creation and removed redundant infoSebastian Ziebell2013-03-072-6/+3
* | Merge branch 'master' into fixes/api, code clean up and tests fixedSebastian Ziebell2013-03-078-10/+182
|\ \ | |/
| * Merge pull request #3047 from mikew/capistrano-deploy-exampleDmitriy Zaporozhets2013-03-071-4/+6
| |\
| | * allow force=yes rake gitlab:setup for capistrano deploy:coldMike Wyatt2013-02-201-4/+6
| * | Merge pull request #3146 from amacarthur/AdminAPIsDmitriy Zaporozhets2013-03-063-0/+70
| |\ \
| | * | Additional Admin APIsAngus MacArthur2013-03-053-0/+70
| * | | Merge pull request #3149 from m4tthumphrey/api-deploy-keysDmitriy Zaporozhets2013-03-061-0/+43
| |\ \ \
| | * | | Project deploy keys APIMatt Humphrey2013-03-051-0/+43
| | |/ /
| * | | Merge pull request #3156 from m4tthumphrey/api-system-hooksDmitriy Zaporozhets2013-03-062-0/+61
| |\ \ \
| | * | | System hooks API.Matt Humphrey2013-03-062-0/+61
| | |/ /
| * | | Don't set format manually, bacause set in routing.Sato Hiroyuki2013-03-061-6/+0
| |/ /
* | | API: refactored and simplified error handling in merge requests APISebastian Ziebell2013-03-052-18/+8
* | | Fixes apiSebastian Ziebell2013-03-051-2/+1
* | | Merge branch 'master' into fixes/apiSebastian Ziebell2013-03-058-334/+21
|\ \ \ | |/ /
| * | Merge pull request #3143 from Undev/state-machine-3Dmitriy Zaporozhets2013-03-052-4/+6
| |\ \
| | * | User's blocked field refactored to use state machineAndrew8xx82013-03-042-4/+6
| * | | Merge pull request #3109 from hiroponz/improve-network-graphDmitriy Zaporozhets2013-03-042-320/+0
| |\ \ \ | | |/ / | |/| |
| | * | Move graph module from lib or vendor directory to app directory.Sato Hiroyuki2013-02-262-320/+0