summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change doc styleguide to use quotes for notesnotes_guidelinesAchilleas Pipinellis2016-02-291-3/+13
* Merge branch 'ci_examples' into 'master' Achilleas Pipinellis2016-02-298-75/+89
|\
| * Link to examples pageAchilleas Pipinellis2016-02-293-1/+14
| * Reorganize CI sections and give descriptive names to linksAchilleas Pipinellis2016-02-294-65/+65
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examplesAchilleas Pipinellis2016-02-2916-46/+290
| |\ | |/ |/|
* | Merge branch 'rs-development-docs' into 'master' Douwe Maan2016-02-292-5/+109
|\ \
| * | Update Gotchas docrs-development-docsRobert Speicher2016-02-171-8/+7
| * | Add "Gotchas" development docRobert Speicher2016-02-162-0/+105
| * | Fix the "How to dump production data" linkRobert Speicher2016-02-161-1/+1
| * | Alphabetize Development doc indexRobert Speicher2016-02-161-5/+5
* | | Update CHANGELOGRobert Speicher2016-02-271-3/+4
* | | Merge branch '13679-fix' into 'master' Achilleas Pipinellis2016-02-272-1/+2
|\ \ \
| * | | Adjust documentation of permissionsThomas Schmidt2016-02-272-1/+2
|/ / /
* | | Merge branch 'rs-fix-issue-filter-spec' into 'master' Robert Speicher2016-02-271-2/+2
|\ \ \
| * | | Fix issue milestone filter specrs-fix-issue-filter-specRobert Speicher2016-02-261-2/+2
* | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-264-10/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-264-10/+18
* | | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-268-25/+155
|\ \ \ \ | |/ / / |/| | |
| * | | Added specs for the various Repository hooksrepository-caching-refactorYorick Peterse2016-02-251-2/+106
| * | | Moved exists condition in Repository#before_deleteYorick Peterse2016-02-251-6/+4
| * | | Move Repository#expire_all_caches to before_deleteYorick Peterse2016-02-231-10/+5
| * | | Moved cache expiration code to Repository hooksYorick Peterse2016-02-237-14/+47
| | | * Move languages to examplesAchilleas Pipinellis2016-02-263-11/+12
| |_|/ |/| |
* | | Merge branch 'avatar-cropping' into 'master' Jacob Schatz2016-02-2621-17/+3525
|\ \ \
| * | | Update CHANGELOGAlfredo Sumaran2016-02-261-0/+1
| * | | Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-2621-80/+93
| |\ \ \
| * \ \ \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-249-44/+103
| |\ \ \ \
| * | | | | Fix Profile Avatar feature stepsRobert Speicher2016-02-241-6/+14
| * | | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-247-7/+26
| * | | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2425-66/+133
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23321-4053/+26568
| |\ \ \ \ \ \
| * | | | | | | Minor changes on avatar cropping internalsJohann Pardanaud2016-02-182-7/+8
| * | | | | | | Improve avatar cropping internals, based on suggestions made by @rspeicher on...Johann Pardanaud2016-02-174-15/+6
| * | | | | | | Merge branch 'master' into avatar-croppingJohann Pardanaud2016-02-16189-1269/+3026
| |\ \ \ \ \ \ \
| * | | | | | | | Improve user experience for avatar croppingJohann Pardanaud2016-02-162-2/+8
| * | | | | | | | Fix failing tests introduced in commit 6d58088Johann Pardanaud2016-02-101-2/+4
| * | | | | | | | Fix #7959: Fix avatar stretching by providing a cropping featureJohann Pardanaud2016-02-0913-8/+3489
* | | | | | | | | Merge branch 'sidebar-hide-class' into 'master' Rémy Coutable2016-02-263-26/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Created helper class to hide content in issue sidebar when collapsedsidebar-hide-classPhil Hughes2016-02-253-26/+19
* | | | | | | | | | Merge branch 'feature/slacky-builds-v2' into 'master' Kamil Trzciński2016-02-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into feature/s...James Lopez2016-02-261-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Update URL syntaxJames Lopez2016-02-251-1/+1
| * | | | | | | | | | | update gitlab-ci script syntaxJames Lopez2016-02-261-1/+1
| * | | | | | | | | | | gemfile random updateJames Lopez2016-02-241-1/+1
| * | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slacky-...James Lopez2016-02-242-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | updated gitlab-ci script to include builds URLJames Lopez2016-02-242-3/+286
| * | | | | | | | | | | testJames Lopez2016-02-241-5/+1
| * | | | | | | | | | | make build failJames Lopez2016-02-241-1/+1
| * | | | | | | | | | | testing scriptJames Lopez2016-02-241-285/+6