summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Replace turbolink spinner with nprogressDmitriy Zaporozhets2014-03-196-12/+7
* Merge pull request #6558 from tsigo/masterDmitriy Zaporozhets2014-03-191-2/+2
|\
| * Fix travis setupRobert Speicher2014-03-181-2/+2
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-1912-1/+321
|\ \
| * \ Merge pull request #6550 from razielgn/slack-integrationDmitriy Zaporozhets2014-03-1911-1/+320
| |\ \ | | |/ | |/|
| | * Added Slack service integration.Federico Ravasio2014-03-1811-1/+320
| |/
| * 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 'ldap_password' into 'master'Dmitriy Zaporozhets2014-03-182-1/+19
|\ \ \ | |/ / |/| |
| * | Do not allow password reset for ldap user.Marin Jankovski2014-03-182-1/+19
|/ /
* | 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 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-03-171-4/+4
|\ \
| * \ Merge pull request #6529 from MrKeiKun/system-hook-fixSytse Sijbrandij2014-03-171-4/+4
| |\ \
| | * | Fixed some minor typos.Kei2014-03-161-4/+4
* | | | Add change to changelog.Marin Jankovski2014-03-171-0/+1
|/ / /
* | | Merge branch 'links_within_same_repo' into 'master'Dmitriy Zaporozhets2014-03-175-27/+50
|\ \ \
| * | | Update markdown documentation, fix wiki spec.Marin Jankovski2014-03-172-15/+38
| * | | Update wiki tests.Marin Jankovski2014-03-171-6/+5
| * | | Wiki will show relative links related to the wiki gollum repository.Marin Jankovski2014-03-172-4/+5
| * | | Link to blob instead of linking to wiki.Marin Jankovski2014-03-171-2/+2
* | | | Merge branch 'mysql-to-og' into 'master'Dmitriy Zaporozhets2014-03-171-0/+9
|\ \ \ \
| * | | | Postgresql conversion script.dosire2014-03-171-0/+9
* | | | | Default value for Snippet#privateDmitriy Zaporozhets2014-03-171-0/+2
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-172-0/+17
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6544 from cirosantilli/show-link-to-public-projects-for-n...Dmitriy Zaporozhets2014-03-172-0/+17
| |\ \ \ \ \
| | * | | | | Show link to public projects for new users.Ciro Santillli2014-03-172-0/+17
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'deeplink' into 'master'Sytse Sijbrandij2014-03-171-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | We have html targets for paragraphs now.dosire2014-03-171-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'project-permissions' into 'master'Dmitriy Zaporozhets2014-03-176-20/+72
|\ \ \ \ \
| * | | | | Fix testsDmitriy Zaporozhets2014-03-171-1/+1
| * | | | | Add more api docsDmitriy Zaporozhets2014-03-171-0/+10
| * | | | | Add tests for API project permissions infoDmitriy Zaporozhets2014-03-172-1/+26
| * | | | | Remove old entitiesDmitriy Zaporozhets2014-03-171-12/+0
| * | | | | Add current user permissions info to /api/projects/:id.jsonDmitriy Zaporozhets2014-03-172-2/+24
| * | | | | Use new grape-entity gem with fixed nested entitiesDmitriy Zaporozhets2014-03-172-5/+12
* | | | | | Merge branch 'split-api-files' into 'master'Dmitriy Zaporozhets2014-03-176-256/+271
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Move project members api to separate fileDmitriy Zaporozhets2014-03-176-256/+271
|/ / / / /
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-03-171-0/+12
|\ \ \ \ \
| * \ \ \ \ Merge branch 'update/changelog' into 'master'Sytse Sijbrandij2014-03-171-0/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | update changelog, add remainder 6.6.X changlog entriesArif Ali2014-03-171-0/+12
| |/ / / /
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-171-1/+1
|\ \ \ \ \
| * \ \ \ \ 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
| | | |_|/ | | |/| |
* | | | | Restore old travis.ymlDmitriy Zaporozhets2014-03-171-0/+2
|/ / / /
* | | | Merge branch 'gmessner/gitlab-ce-issue-110'Dmitriy Zaporozhets2014-03-163-3/+13
|\ \ \ \
| * \ \ \ Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessn...Dmitriy Zaporozhets2014-03-163-3/+13
| |\ \ \ \ |/ / / / /
| * | | | Added tests of Create and Update MR description.Greg Messner2014-03-101-1/+8
| * | | | Added description parameter support to Create and Update MR API endpoints (is...Greg Messner2014-03-032-2/+5