summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Filter out old notes in NotesFinderJacob Vosmaer2014-04-282-1/+14
* Fail faster on an invalid target_typeJacob Vosmaer2014-04-282-0/+7
* Notes have noteables but no commitsJacob Vosmaer2014-04-281-1/+1
* Add NotesFinder specJacob Vosmaer2014-04-281-0/+26
* Merge branch 'update/6.0-to-6.8' into 'master'Dmitriy Zaporozhets2014-04-271-7/+8
|\
| * Use gitlab-shell 1.9.3Jacob Vosmaer2014-04-251-1/+1
| * Replace 6.0-to-6.7.md with 6.0-to-6.8.mdJacob Vosmaer2014-04-251-6/+7
|/
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-251-5/+5
|\
| * Merge branch 'fix-grammar-help-webhooks' into 'master'Sytse Sijbrandij2014-04-241-5/+5
| |\
| | * Multiple grammar/typo fixes in web hooks helpPhilipp Hansch2014-04-231-5/+5
| |/
* | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-251-1/+1
|\ \
| * \ Merge pull request #6847 from Philzen/patch-2Dmitriy Zaporozhets2014-04-241-1/+1
| |\ \
| | * | # Fix description TypoPhilzen2014-04-231-1/+1
* | | | Merge branch 'rake_setup' into 'master'Dmitriy Zaporozhets2014-04-253-2/+34
|\ \ \ \
| * | | | Add doc file for dev rake tasksDmitriy Zaporozhets2014-04-242-2/+30
| * | | | Add rake setup alias for gitlab:setupDmitriy Zaporozhets2014-04-241-0/+4
| |/ / /
* | | | Merge branch 'index_on_iid' into 'master'Dmitriy Zaporozhets2014-04-254-0/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Migrate invalid rows with missing iids or duplicatesDmitriy Zaporozhets2014-04-242-0/+26
| * | | Add iids changelog entryDmitriy Zaporozhets2014-04-241-0/+1
| * | | Add uniq db index on project_id+iidDmitriy Zaporozhets2014-04-242-0/+10
* | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-241-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #6843 from evanlucas/bug/6546Dmitriy Zaporozhets2014-04-241-2/+2
| |\ \ \
| | * | | Fix syntax highlightingEvan Lucas2014-04-221-2/+2
| | |/ /
* | | | Merge branch 'mysql_field_limits' into 'master'Dmitriy Zaporozhets2014-04-245-18/+18
|\ \ \ \
| * | | | Move changelog entries to 6.9.0Jacob Vosmaer2014-04-231-2/+4
| * | | | Move the adapter check to the migrationJacob Vosmaer2014-04-232-9/+2
| * | | | Adjust MySQL limits for existing installationsJacob Vosmaer2014-04-234-9/+14
* | | | | Merge branch 'tests_for_fog' into 'master'Dmitriy Zaporozhets2014-04-244-3/+20
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make sure that tests pass when aws group is used.Marin Jankovski2014-04-244-3/+20
|/ / / /
* | | | Merge pull request #6848 from hszcg/masterDmitriy Zaporozhets2014-04-241-3/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove fixed height for diff tableChenguang Zhang2014-04-231-3/+0
| | |/ | |/|
* | | Improve ssh_host settingsDmitriy Zaporozhets2014-04-231-2/+2
* | | Fix default ssh_host settingDmitriy Zaporozhets2014-04-231-0/+1
* | | We are at 6.9.0.pre.Marin Jankovski2014-04-231-1/+1
* | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqDmitriy Zaporozhets2014-04-231-1/+1
|\ \ \
| * \ \ Merge branch 'bump_gitlab_shell' into 'master'Jacob Vosmaer2014-04-231-1/+1
| |\ \ \
| | * | | Bump the required gitlab-shell version to 1.9.3Jacob Vosmaer2014-04-231-1/+1
| | | |/ | | |/|
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ceDmitriy Zaporozhets2014-04-234-2/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'email_in_gravatar_urls' into 'master'Dmitriy Zaporozhets2014-04-232-1/+2
| |\ \ \
| | * \ \ Merge branch 'email_in_gravatar_urls' of gitlab.com:arnaud/gitlab-ce into ema...Arnaud ABELARD2014-04-120-0/+0
| | |\ \ \
| | | * | | add mentions of the different placeholders possible for gravatar urls, mentio...Arnaud Abélard2014-04-101-1/+2
| | | * | | allow using the user's email address as a http parameter in gravatar urls for...Arnaud Abélard2014-01-111-2/+2
| | * | | | allow using the user's email address as a http parameter in gravatar urls for...Arnaud ABELARD2014-04-122-1/+2
| * | | | | Merge branch 'bug-to-ldap-configuration' into 'master'Dmitriy Zaporozhets2014-04-231-1/+2
| |\ \ \ \ \
| | * | | | | Actually use the 'user_filter' configuration optionTravis Odom2014-04-211-1/+2
| * | | | | | Merge branch 'render_docs' into 'master'Dmitriy Zaporozhets2014-04-231-0/+2
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Newline between sentence and code blockAchilleas Pipinellis2014-04-221-0/+2
| |/ / / / /
* | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqDmitriy Zaporozhets2014-04-239-62/+155
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge pull request #6795 from cirosantilli/markdown-styleguideDmitriy Zaporozhets2014-04-231-6/+7
| |\ \ \ \ \
| | * | | | | Add markdown styleguide.Ciro Santilli2014-04-211-6/+7