summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add User#disable_two_factor!rs-disable-2faRobert Speicher2015-07-105-17/+33
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-07-102-2/+2
|\
| * Update image to latest oneSytse Sijbrandij2015-07-101-1/+1
| * Merge branch 'fix-migrating-from-svn-doc-link' into 'master'Stan Hu2015-07-101-1/+1
| |\
| | * Fix migrating from SVN document linkStan Hu2015-07-101-1/+1
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqSytse Sijbrandij2015-07-1023-17/+189
|\ \ \ | |/ /
| * | Merge branch 'compact-sidebar' into 'master'Dmitriy Zaporozhets2015-07-101-6/+3
| |\ \
| | * | Smaller font and leing height for sidebar elementsDmitriy Zaporozhets2015-07-101-6/+3
| |/ /
| * | Merge branch 'labels-small-buttons' into 'master'Dmitriy Zaporozhets2015-07-101-2/+2
| |\ \
| | * | Make edit/remove label buttons smallerlabels-small-buttonsDmitriy Zaporozhets2015-07-101-2/+2
| |/ /
| * | Merge branch 'fork_visibility_level' into 'master'Dmitriy Zaporozhets2015-07-108-1/+106
| |\ \
| | * | Fork visibility level fixfork_visibility_levelValery Sizov2015-07-068-1/+106
| * | | Merge branch 'hierarchical-navigation'Dmitriy Zaporozhets2015-07-108-1/+64
| |\ \ \
| | * | | Better name for group tabhierarchical-navigationDmitriy Zaporozhets2015-07-101-1/+1
| | * | | Make left menu more hierarchical and less contextual by adding back item at topDmitriy Zaporozhets2015-07-108-0/+63
| * | | | Fix missing avatar in event feed when created projectDmitriy Zaporozhets2015-07-101-0/+1
| |/ / /
| * | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-07-102-6/+3
| |\ \ \
| * \ \ \ Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-105-7/+13
| |\ \ \ \
| | * | | | Fixed the issuescomment-box-changesDarby2015-07-094-3/+5
| | * | | | Comment box/Placeholder text redoDarby2015-07-015-7/+11
* | | | | | Add volumes to marathon file.Sytse Sijbrandij2015-07-101-1/+18
| |_|/ / / |/| | | |
* | | | | Revert "Remove intro and link to Dockerhub"Sytse Sijbrandij2015-07-101-4/+1
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-07-101-1/+1
|\ \ \ \ \
| * | | | | Remove intro and link to DockerhubSytse Sijbrandij2015-07-101-1/+4
| * | | | | Remove intro and link to DockerhubSytse Sijbrandij2015-07-101-5/+2
| |/ / / /
* | | | | Merge branch 'readme-ci-com-badge' into 'master' Dmitriy Zaporozhets2015-07-101-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Point to ci.gitlab.com badge in READMEDmitriy Zaporozhets2015-07-091-1/+1
* | | | | Merge branch 'rs-update-coveralls' into 'master'Dmitriy Zaporozhets2015-07-102-12/+5
|\ \ \ \ \
| * | | | | Bump coveralls version, remove explicit rest-client dependencyrs-update-coverallsRobert Speicher2015-07-092-12/+5
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-issue-1939' into 'master'Marin Jankovski2015-07-102-1/+17
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Reset ul list style types inside notesrs-issue-1939Robert Speicher2015-07-091-0/+16
| * | | | Style all blockquote children, not just pRobert Speicher2015-07-091-1/+1
| |/ / /
* | | | Merge branch 'revert-note-query-information' into 'master'Stan Hu2015-07-092-11/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Revert "api: add 'system', 'upvote', and 'downvote' fields to note queries"Stan Hu2015-07-092-11/+2
|/ / /
* | | Merge branch 'note-query-information' into 'master'Stan Hu2015-07-092-2/+11
|\ \ \
| * | | api: add 'system', 'upvote', and 'downvote' fields to note queriesBen Boeckel2015-07-092-2/+11
|/ / /
* | | Merge branch 'docker-single' into 'master'Kamil TrzciƄski2015-07-0911-232/+131
|\ \ \
| * | | Markdown fixdocker-singleKamil Trzcinski2015-07-071-1/+1
| * | | Add note about HTTPSKamil Trzcinski2015-07-071-0/+2
| * | | Fix port issueKamil Trzcinski2015-07-071-1/+1
| * | | Fix port 80443 => 8443Kamil Trzcinski2015-07-061-1/+1
| * | | Final touchesKamil Trzcinski2015-07-061-12/+12
| * | | Update Docker documentation to use single containerKamil Trzcinski2015-07-0611-231/+125
| * | | Added data volumes to DockerfileKamil Trzcinski2015-07-061-2/+5
| | |/ | |/|
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-092-1/+6
|\ \ \
| * \ \ Merge branch 'cache-readme' into 'master'Dmitriy Zaporozhets2015-07-092-1/+6
| |\ \ \
| | * | | Cache readme rendering resultDmitriy Zaporozhets2015-07-092-1/+6
| |/ / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-07-091-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #9438 from bbodenmiller/patch-3Dmitriy Zaporozhets2015-07-091-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | dont -> don'tBen Bodenmiller2015-07-071-1/+1