summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Sort .gitignore.Ciro Santilli2014-11-291-28/+28
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2014-11-273-0/+109
|\
| * Merge branch 'master' into 'master'Sytse Sijbrandij2014-11-273-0/+109
| |\
| | * Add Dockerfile to build an Omnibus GitLab imageVincent Robert2014-11-273-0/+109
| |/
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2014-11-272-1/+4
|\ \
| * \ Merge pull request #8406 from bbodenmiller/patch-4Sytse Sijbrandij2014-11-261-0/+3
| |\ \
| | * | add details on protected branchesBen Bodenmiller2014-11-261-0/+3
| |/ /
| * | Merge pull request #8394 from robertd/update-time-zone-in-gitlab-ymlRobert Schilling2014-11-261-1/+1
| |\ \ | | |/ | |/|
| | * Update time zone rake task for production. Resolves #8387Robert Djurasaj2014-11-251-1/+1
| |/
* | Merge branch 'office_analogy' into 'master'Sytse Sijbrandij2014-11-271-0/+32
|\ \
| * | remove unnecessarry imageMarc Radulescu2014-11-272-1/+1
| * | replaced hotlinkMarc Radulescu2014-11-262-1/+1
| * | added office analogy to help understanding of gitlab architectureMarc Radulescu2014-11-261-0/+32
|/ /
* | Merge branch 'select-a-tag' into 'master'Jacob Vosmaer2014-11-261-3/+3
|\ \ | |/ |/|
| * Change it earlier as well.Sytse Sijbrandij2014-11-261-1/+1
| * Selecting a branch is dangerous now that we have rc in a branch.Sytse Sijbrandij2014-11-261-3/+3
|/
* Merge branch 'git_hook_messages_ce' of dev.gitlab.org:gitlab/gitlabhqJacob Vosmaer2014-11-249-48/+76
|\
| * Git hook messages: wiki access fixValery Sizov2014-11-242-2/+2
| * Bump gitlab-shellValery Sizov2014-11-241-1/+1
| * Better message for failed pushes because of git hooksValery Sizov2014-11-189-48/+76
* | Merge branch 'security-release-ownership' into 'master'Marin Jankovski2014-11-243-1/+6
|\ \
| * | Explicitly mention patch releasesJacob Vosmaer2014-11-241-1/+1
| * | Establish ownership of security releasesJacob Vosmaer2014-11-242-0/+3
| * | The release manager handles all releasesJacob Vosmaer2014-11-241-1/+3
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2014-11-241-0/+4
|\ \ \
| * \ \ Merge pull request #8319 from bbodenmiller/patch-12Robert Schilling2014-11-231-0/+4
| |\ \ \
| | * | | start gitlab after mysql tweaksBen Bodenmiller2014-11-231-0/+4
* | | | | Formatting and sequence of contrubution paragraphs.Sytse Sijbrandij2014-11-241-3/+3
| |_|/ / |/| | |
* | | | More explicit wording of the documentation.Sytse Sijbrandij2014-11-241-7/+7
* | | | Merge branch 'backup-cron-mode' into 'master'Valery Sizov2014-11-246-52/+77
|\ \ \ \ | |/ / / |/| | |
| * | | Explain why we create a StringIOJacob Vosmaer2014-11-201-0/+2
| * | | Add CRON=1 backup setting for quiet backupsJacob Vosmaer2014-11-206-52/+75
* | | | Merge branch 'members_table_timestamps' into 'master'Valery Sizov2014-11-213-1/+17
|\ \ \ \
| * | | | Add missing timestamps to the 'members' tableJacob Vosmaer2014-11-213-1/+17
* | | | | Merge branch 'milestones_labels' into 'master'Marin Jankovski2014-11-217-15/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Possibility to create Milestones or Labels when Issues are disabledValery Sizov2014-11-207-15/+28
* | | | | Merge branch 'shell220' into 'master'Jacob Vosmaer2014-11-201-5/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | you have to update gitlab shell for gitlab 7.5Job van der Voort2014-11-201-5/+13
* | | | | Merge branch 'rebuild-keys' into 'master'Jacob Vosmaer2014-11-201-0/+24
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add correct path to rebuild-keys docJob van der Voort2014-11-201-1/+2
| * | | | add rebuilding of authorized_keys to docsJob van der Voort2014-11-201-0/+23
|/ / / /
* | | | Merge branch 'improve-mobile-ui' into 'master'Dmitriy Zaporozhets2014-11-195-4/+35
|\ \ \ \
| * | | | Fix header and project home ui for mobileDmitriy Zaporozhets2014-11-194-2/+16
| * | | | Improve dashboard page for mobileDmitriy Zaporozhets2014-11-191-2/+19
|/ / / /
* | | | Merge branch 'increase-font-size' into 'master'Dmitriy Zaporozhets2014-11-192-6/+3
|\ \ \ \
| * | | | Increase md typography font sizeDmitriy Zaporozhets2014-11-192-6/+3
|/ / / /
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqValery Sizov2014-11-191-3/+6
|\ \ \ \
| * \ \ \ Merge pull request #8345 from dserodio/doc-improvementRobert Schilling2014-11-181-3/+6
| |\ \ \ \
| | * | | | Small improvement to /api/user/keys docDaniel Serodio2014-11-181-3/+6
| | | |_|/ | | |/| |
* | | | | bump gitlab_shellValery Sizov2014-11-191-1/+1
|/ / / /