summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'safe-content-type' into 'master' Douwe Maan2016-03-013-12/+23
|\
| * Explain why we mangle blob content typessafe-content-typeJacob Vosmaer2016-02-243-12/+23
* | Merge branch 'issue_13851' into 'master' Rémy Coutable2016-03-011-1/+14
|\ \
| * | Bring back Gitlab textissue_13851Alfredo Sumaran2016-02-291-1/+14
* | | Merge branch 'fix/contributions-forked-projects' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributio...James Lopez2016-02-29113-624/+1038
| |\ \ \
| * | | | include contributions from forked projects on profile calendarJames Lopez2016-02-221-1/+1
* | | | | Merge branch 'master' into issue_13212issue_13212Alfredo Sumaran2016-02-2922-76/+244
|\ \ \ \ \
| * \ \ \ \ Merge branch 'issue_13648' into 'master' Dmitriy Zaporozhets2016-02-292-14/+22
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Logged in user should be able to read internal forks.Rubén Dávila2016-02-271-1/+1
| | * | | | Improve implementation to check read access to forks and add pagination.Rubén Dávila2016-02-262-14/+22
| * | | | | Merge branch 'removed-ngprogress' into 'master' Jacob Schatz2016-02-296-10/+8
| |\ \ \ \ \
| | * | | | | Removed NGProgressremoved-ngprogressPhil Hughes2016-02-296-10/+8
| * | | | | | Merge branch 'too-many-changes-btns' into 'master' Jacob Schatz2016-02-291-6/+5
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Changed too many changes buttons to whitetoo-many-changes-btnsPhil Hughes2016-02-291-6/+5
| | |/ / / /
| * | | | | Merge branch 'improve-todos-css' into 'master' Dmitriy Zaporozhets2016-02-292-35/+6
| |\ \ \ \ \
| | * | | | | Small css cleanup for todos featureimprove-todos-cssDmitriy Zaporozhets2016-02-272-35/+6
| | |/ / / /
| * | | | | Merge branch '11489-branded-appearance-to-ce' into 'master' Douwe Maan2016-02-299-10/+199
| |\ \ \ \ \
| | * | | | | Branded login page also in CE11489-branded-appearance-to-ceZeger-Jan van de Weg2016-02-269-10/+199
| * | | | | | Merge branch 'issue_13621' into 'master' Douwe Maan2016-02-291-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Don't repeat labels listed on Labels tab.issue_13621Rubén Dávila2016-02-221-1/+1
| * | | | | | Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master' Robert Speicher2016-02-261-0/+3
| |\ \ \ \ \ \
| | * | | | | | Allow webhooks URL to have leading and trailing spacesevuez/gitlab-ce-webhook-url-spacesevuez2016-02-261-0/+3
* | | | | | | | Comment icon vertically alignedAlfredo Sumaran2016-02-291-0/+1
* | | | | | | | Wrap icon with edited timeAlfredo Sumaran2016-02-292-2/+2
* | | | | | | | Increase paddingAlfredo Sumaran2016-02-291-1/+1
* | | | | | | | Keep edited time on the same line as wellAlfredo Sumaran2016-02-291-1/+1
* | | | | | | | Apply nice date when diff page loadsAlfredo Sumaran2016-02-291-0/+1
* | | | | | | | Keep date in the same lineAlfredo Sumaran2016-02-291-0/+4
* | | | | | | | Prevent content misalignmentAlfredo Sumaran2016-02-291-0/+8
|/ / / / / / /
* | | | | | | Merge branch 'repository-caching-refactor' into 'master' Robert Speicher2016-02-267-23/+49
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
* | | | | | | Merge branch 'avatar-cropping' into 'master' Jacob Schatz2016-02-269-5/+129
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into avatar-croppingavatar-croppingAlfredo Sumaran2016-02-268-73/+50
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'rs-crowd-form-view-spec' into avatar-croppingAlfredo Sumaran2016-02-244-8/+12
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-1/+1
| * | | | | | | | | Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-2418-62/+82
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into avatar-croppingAlfredo Sumaran2016-02-23153-1811/+3800
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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-1687-469/+576
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | 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-099-8/+133
* | | | | | | | | | | | | 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 'refactor-lists' into 'master' Dmitriy Zaporozhets2016-02-2617-171/+171
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Improve help UI pageDmitriy Zaporozhets2016-02-262-104/+127
View Lorry Controller Status