summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* rc1v6.7.0.rc1Dmitriy Zaporozhets2014-03-201-1/+1
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-204-73/+73
|\
| * Merge pull request #6568 from skv-headless/patch-1Sytse Sijbrandij2014-03-191-1/+1
| |\
| | * typo fixEvgeniy Sokovikov2014-03-191-1/+1
| |/
| * Merge pull request #6469 from mojavelinux/masterSytse Sijbrandij2014-03-191-1/+1
| |\
| | * Add .adoc file extension for AsciiDocDan Allen2014-03-041-1/+1
| * | Merge pull request #6457 from lol768/patch-1Sytse Sijbrandij2014-03-191-1/+1
| |\ \
| | * | Fix registration error info typolol7682014-03-021-1/+1
| * | | Merge pull request #6535 from docwhat/sys-hooks-eolsSytse Sijbrandij2014-03-191-70/+70
| |\ \ \
| | * | | Switched line endings to LF for system_hooks.mdChristian HoĢˆltje2014-03-141-70/+70
* | | | | Merge branch 'someone-asked-us-to-update-the-changelog' into 'master'Dmitriy Zaporozhets2014-03-191-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Spinner in changelog.dosire2014-03-191-0/+1
* | | | | Merge pull request #6557 from tsigo/faster-merge-request-featuresDmitriy Zaporozhets2014-03-194-40/+33
|\ \ \ \ \
| * | | | | Speed up finders/merge_requests_finder_specRobert Speicher2014-03-191-11/+7
| * | | | | Speed up features/notes_on_merge_requests_specRobert Speicher2014-03-193-29/+26
* | | | | | Merge pull request #6560 from tsigo/visibility-traitsDmitriy Zaporozhets2014-03-1911-54/+54
|\ \ \ \ \ \
| * | | | | | Make use of project factory traitsRobert Speicher2014-03-1910-54/+42
| * | | | | | Add public/private/internal traits to :project FactoryRobert Speicher2014-03-191-0/+12
| |/ / / / /
* | | | | | Add room placeholder for Slack integrationDmitriy Zaporozhets2014-03-191-1/+1
* | | | | | Merge branch 'nprogress' into 'master'Dmitriy Zaporozhets2014-03-196-12/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
| | |/ / / / / | |/| | | | |