summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 7.2 startedRobert Schilling2014-07-281-1/+1
* Merge pull request #7319 from jvanbaarsen/small-eventcache-refactoringDmitriy Zaporozhets2014-07-264-9/+9
|\
| * Moved some behaviour to one placeJeroen van Baarsen2014-07-254-9/+9
* | Merge branch 'most-starred' into 'master'Dmitriy Zaporozhets2014-07-268-3/+50
|\ \
| * | Tests for trending/starred pagesDmitriy Zaporozhets2014-07-264-4/+27
| * | Most starred projects page for Explore areaDmitriy Zaporozhets2014-07-255-1/+25
|/ /
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-07-251-1/+1
|\ \
| * \ Merge branch 'word-requirement-a-bit-more-realistic' into 'master'Sytse Sijbrandij2014-07-251-1/+1
| |\ \
| | * | Based on http://www.reddit.com/r/linux/comments/2bffgt/gitlab_71_released/cj5...word-requirement-a-bit-more-realisticSytse Sijbrandij2014-07-231-1/+1
* | | | Merge branch 'exim-problems' into 'master'Dmitriy Zaporozhets2014-07-251-1/+1
|\ \ \ \
| * | | | Note exim problems.Sytse Sijbrandij2014-07-241-1/+1
* | | | | Merge branch 'project-services-explained' into 'master'Dmitriy Zaporozhets2014-07-251-0/+9
|\ \ \ \ \
| * | | | | Explain project services.Sytse Sijbrandij2014-07-251-0/+9
|/ / / / /
* | | | | Merge branch 'backup-settings-warning' into 'master'Jacob Vosmaer2014-07-251-1/+9
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add warning about backing up the config.Sytse Sijbrandij2014-07-251-1/+9
|/ / / /
* | | | Merge branch 'improve-star-ui' into 'master'Dmitriy Zaporozhets2014-07-249-64/+87
|\ \ \ \ | |/ / / |/| | |
| * | | Fix star testsDmitriy Zaporozhets2014-07-242-2/+6
| * | | Move star button to sidebar. Add counter to forks tooDmitriy Zaporozhets2014-07-247-62/+81
|/ / /
* | | Mention Explore page in CHANGELOGDmitriy Zaporozhets2014-07-241-0/+1
* | | Fix testDmitriy Zaporozhets2014-07-241-2/+1
* | | Merge branch 'cirosantilli-star'Dmitriy Zaporozhets2014-07-2426-37/+380
|\ \ \
| * \ \ Merge branch 'star' of https://github.com/cirosantilli/gitlabhq into cirosant...Dmitriy Zaporozhets2014-07-2426-37/+380
| |\ \ \ |/ / / /
| * | | Move destroy user feature to spec.Ciro Santilli2014-07-173-18/+14
| * | | Helper instead of template.Ciro Santilli2014-07-173-25/+25
| * | | Fix hound.Ciro Santilli2014-07-171-1/+1
| * | | Add star count, view logic, more tests.Ciro Santilli2014-07-1710-17/+95
| * | | Move coffee to assets/projectCiro Santilli2014-07-172-5/+5
| * | | Fix failing spec.Ciro Santilli2014-07-172-3/+4
| * | | Add project stars.Ciro Santilli2014-07-1725-35/+301
* | | | Merge pull request #6650 from lloeki/wiki_images_attachmentsDmitriy Zaporozhets2014-07-233-3/+44
|\ \ \ \
| * | | | Added ability to serve files in wiki repositoryLoic Nageleisen2014-06-073-3/+44
* | | | | Merge pull request #7089 from NARKOZ/api-patchDmitriy Zaporozhets2014-07-232-1/+5
|\ \ \ \ \
| * | | | | update API docsNihad Abbasov2014-06-061-0/+1
| * | | | | API: ability to set an import url when creating project for a specified userNihad Abbasov2014-06-061-1/+4
* | | | | | Merge pull request #7141 from PuzzleFlow/uid_should_always_be_stringDmitriy Zaporozhets2014-07-231-1/+3
|\ \ \ \ \ \
| * | | | | | ensure that uid is a stringPaweł Świątkowski2014-06-211-1/+3
* | | | | | | Merge pull request #7318 from jvanbaarsen/constant-warning-fixDmitriy Zaporozhets2014-07-232-9/+9
|\ \ \ \ \ \ \
| * | | | | | | Removed some constant allready defined warningsJeroen van Baarsen2014-07-162-9/+9
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'new_user_password_set' into 'master'Dmitriy Zaporozhets2014-07-238-24/+27
|\ \ \ \ \ \ \
| * | | | | | | Update the note for admin user.Marin Jankovski2014-07-171-2/+2
| * | | | | | | Use a better name for token.Marin Jankovski2014-07-161-3/+3
| * | | | | | | Update specs.Marin Jankovski2014-07-162-4/+8
| * | | | | | | Do not set password expiry.Marin Jankovski2014-07-151-1/+1
| * | | | | | | Do not sent a generated password via email for admin created user.Marin Jankovski2014-07-156-18/+17
* | | | | | | | Merge pull request #7332 from sugarmo/fix-graph-log-timeoutDmitriy Zaporozhets2014-07-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix timeout error when preparing git graph.Steven Mok2014-07-181-1/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #7316 from ayr-ton/masterDmitriy Zaporozhets2014-07-234-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add support to set satellites timeoutAyrton Araújo2014-07-214-2/+7
* | | | | | | | | Merge pull request #7340 from cirosantilli/diff-contrastDmitriy Zaporozhets2014-07-231-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Increase diff byte highlight contrast.Ciro Santilli2014-07-211-2/+2