summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* add details on protected branchesBen Bodenmiller2014-11-261-0/+3
| | | | | | | | Add some details from https://about.gitlab.com/2014/11/26/keeping-your-code-protected/: Who can: * Force push to non-protected branches * Force push to protected branches * Remove protected branches
* 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 #8387
| * Update time zone rake task for production. Resolves #8387Robert Djurasaj2014-11-251-1/+1
|/
* Merge branch 'git_hook_messages_ce' of dev.gitlab.org:gitlab/gitlabhqJacob Vosmaer2014-11-249-48/+76
|\ | | | | | | | | Conflicts: GITLAB_SHELL_VERSION
| * 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
| | | | | | | | | | | | Conflicts: lib/gitlab/git_access.rb spec/lib/gitlab/git_access_spec.rb
* | Merge branch 'security-release-ownership' into 'master'Marin Jankovski2014-11-243-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security release ownership We saw the following problems around the 7.4.4 release: - the fix got merged into master while it should have been held back - there was a security fix but no release manager to release it With this change we want to improve our process and documentation to prevent situations like this in the future. See merge request !1273
| * | 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 tweaks
| | * | | 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
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup cron mode If you have your server configured to receive emails containing the output of cron jobs it is annoying to get long spammy emails from the backup script. This change adds a 'cron mode' that makes the backup script silent unless something goes wrong during the backup. See merge request !1268
| * | | 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' table In 20140914145549_migrate_to_new_members_model.rb we forgot to set the created_at and updated_at times for new records in the 'members' table. This became a problem after commit c8e78d972a5a628870eefca0f2ccea0199c55bda which was added in GitLab 7.5. With this migration we ensure that all rows in 'members' have at least some created_at and updated_at timestamp. See merge request !1272
| * | | | 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 disabled https://dev.gitlab.org/gitlab/gitlabhq/issues/1682 See merge request !1270
| * | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | Add GitLab shell update to update guide See merge request !1269
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebuild keys This was clearly lacking for the documenation. See merge request !1267
| * | | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve mobile UI. pt1 Related to #1493 * [x] App Header * [x] Dashboard * [x] Project home page See merge request !1266
| * | | | Fix header and project home ui for mobileDmitriy Zaporozhets2014-11-194-2/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improve dashboard page for mobileDmitriy Zaporozhets2014-11-191-2/+19
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'increase-font-size' into 'master'Dmitriy Zaporozhets2014-11-192-6/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase font size Increase markdown typography font size to 15px. Affected: * wiki * issue/mr description * md files * comments Fixes #1662 See merge request !1265
| * | | | Increase md typography font sizeDmitriy Zaporozhets2014-11-192-6/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | 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 docs
| | * | | | Small improvement to /api/user/keys docDaniel Serodio2014-11-181-3/+6
| | | |_|/ | | |/| | | | | | | | | | | | The keys resource includes a create_at attribute
* | | | | bump gitlab_shellValery Sizov2014-11-191-1/+1
|/ / / /
* | | | Merge branch 'hide-gpg-signature' into 'master'Dmitriy Zaporozhets2014-11-182-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide gpg signature Fixes #1743 See merge request !1263
| * | | | Hide gpg signature on tags page from tag messageDmitriy Zaporozhets2014-11-182-1/+6
| | |/ / | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Start 7.6.0Dmitriy Zaporozhets2014-11-182-1/+18
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'bump-gitlab_git' into 'master'Dmitriy Zaporozhets2014-11-182-5/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Bump gitlab git See merge request !1261
| * | | Bump gitlab_git with new ruggedDmitriy Zaporozhets2014-11-182-5/+5
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'fix_tests' into 'master'Dmitriy Zaporozhets2014-11-187-95/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | Fix tests See merge request !1262
| * | | Use new gitlab-shell v2.3.0Dmitriy Zaporozhets2014-11-182-1/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Revert "gitlab shell works if multiple rubies installed"Dmitriy Zaporozhets2014-11-188-98/+40
|/ / / | | | | | | | | | This reverts commit 533f4cdf30b38c587f7a91f0dfd898b907ecd944.
* | | Merge pull request #8340 from cirosantilli/multi-ruby-install-v2Dmitriy Zaporozhets2014-11-188-40/+98
|\ \ \ | |/ / |/| | Web edit and HTTPS push work if multiple Rubies installed v2
| * | gitlab shell works if multiple rubies installedCiro Santilli2014-11-188-40/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this it would fail because git hooks automatically prepend things to the path, which can lead the wrong Ruby version to be called in which dependencies are not installed. To make sure that this is correct, the forked_merge_requests commented out test that depends on this change was uncommented. For that test to pass, it is also necessary to setup the mock server on port 3001 under test_env.rb.
* | | Merge branch 'fork-to-group' into 'master'Dmitriy Zaporozhets2014-11-1819-59/+225
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fork to group Fixes #1592 * project can be forked into group * fork link always lead to fork page where you select namespace where to fork See merge request !1253
| * | Improve fork to namespaces featureDmitriy Zaporozhets2014-11-149-15/+86
| | | | | | | | | | | | | | | | | | | | | | | | * Show namespace thumbnail differently if project was already forked * Show loading spinner when click on fork * Fork link navigates to personal namespace only if no manageable groups exists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Routing specs for fork projectsDmitriy Zaporozhets2014-11-141-5/+10
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>