summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into mail-room-config-without-railsmail-room-config-without-railsDouwe Maan2016-02-2914-41/+181
|\
| * 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
* | | Fix `gitlab:incoming_email:check` task.Douwe Maan2016-02-291-4/+6
* | | Don't load all of GitLab in mail_roomDouwe Maan2016-02-266-41/+129
|/ /
* | 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
* | | | | | | | | | | Merge branch 'refactor-lists' into 'master' Dmitriy Zaporozhets2016-02-2617-171/+171
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Improve help UI pageDmitriy Zaporozhets2016-02-262-104/+127
| * | | | | | | | | | Fix description margin for groups listDmitriy Zaporozhets2016-02-265-11/+31
| * | | | | | | | | | Refactor styles for merge requests listDmitriy Zaporozhets2016-02-263-10/+3
| * | | | | | | | | | Refactor styles for issues listDmitriy Zaporozhets2016-02-264-16/+4
| * | | | | | | | | | Refactor css for groups listDmitriy Zaporozhets2016-02-261-2/+2
| * | | | | | | | | | Refactor css for snippets listDmitriy Zaporozhets2016-02-263-28/+5
| * | | | | | | | | | Cleanup css for projects listDmitriy Zaporozhets2016-02-265-13/+12