summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 7.3.0.Marin Jankovski2014-09-221-1/+1
|
* Merge branch 'revert_sticky_headers' into 'master'Marin Jankovski2014-09-223-173/+1
|\ | | | | | | | | | | Revert sticky headers See merge request !1104
| * Revert "Diff headers made sticky."Marin Jankovski2014-09-223-173/+1
|/ | | | This reverts commit 6eb85b1a30eb2e87fc6a55d17bb38fdf535a516b.
* Merge pull request #7815 from Razer6/zen/fix_scroll_positionMarin Jankovski2014-09-221-0/+7
|\ | | | | Save last scrollposition and scroll back when leaving ZEN mode
| * Save last scrollposition and scroll back when leaving ZEN modeRobert Schilling2014-09-211-0/+7
| |
* | Merge pull request #7812 from bbodenmiller/7.3-upgradeMarin Jankovski2014-09-223-13/+24
|\ \ | | | | | | improve 7.3 upgrade process & redis setup
| * | improve 7.3 upgrade process & redius setupBen Bodenmiller2014-09-213-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/gitlabhq/gitlabhq/commit/2b35c887904b6a7a05a7c88fdf1ccd66ba943e20#commitcomment-7829537, https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829367, & https://github.com/gitlabhq/gitlabhq/commit/5704e6fee9d2dea67c4a91b43d06a9958484d29b#commitcomment-7829381
* | | Merge pull request #7809 from bbodenmiller/patch-25Marin Jankovski2014-09-221-1/+1
|\ \ \ | |_|/ |/| | update gitlab shell to 1.9.8 for gitlab 7.2.2
| * | update gitlab shell to 1.9.8 for gitlab 7.2.2Ben Bodenmiller2014-09-211-1/+1
| |/ | | | | As committed in https://github.com/gitlabhq/gitlabhq/commit/873acfd9aa54e801d5786c32b05c4f8ad21af72a GitLab 7.2.2 requires GitLab Shell 1.9.8. Fixes https://github.com/gitlabhq/gitlabhq/issues/7806.
* | Merge pull request #7814 from cirosantilli/test-typoRobert Schilling2014-09-212-2/+2
|\ \ | | | | | | Typo it -> its.
| * | Typo it -> its.Ciro Santilli2014-09-212-2/+2
| | |
* | | Merge pull request #7811 from bbodenmiller/patch-12Robert Schilling2014-09-212-5/+5
|\ \ \ | |_|/ |/| | formatting improvements to 6.0-to-7.3.md
| * | formatting improvements to upgrade guidesBen Bodenmiller2014-09-212-5/+5
|/ /
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-09-2013-37/+43
|\ \ | |/
| * Merge pull request #7805 from Razer6/improve/zenRobert Schilling2014-09-201-0/+1
| |\ | | | | | | Prevent default action when closing zen mode
| | * Prevent default action when closing zen modeRobert Schilling2014-09-201-0/+1
| |/
| * Merge pull request #7801 from cirosantilli/dry-zen-viewRobert Schilling2014-09-205-19/+22
| |\ | | | | | | Factor zen mode.
| | * Factor zen mode.Ciro Santilli2014-09-205-19/+22
| | |
| * | Merge pull request #7798 from spuder/issue#7763Sytse Sijbrandij2014-09-201-2/+4
| |\ \ | | | | | | | | Adds support for ruby 1.8 in webhook example
| | * | Adds support for ruby 1.8 in webhook example, issue #7763Spencer Owen2014-09-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using the hash rocket syntax, the web hook will work on older versions of ruby (1.8) in addition to 1.9, 2.0 ect.. Moves do .. end to separate lines for ruby-lint. Additional Information: http://stackoverflow.com/questions/25899476/webrick-gives-error-unexpected-expecting-end https://github.com/spuder/r10k_gitlab_webhook
| * | | Merge pull request #7771 from cirosantilli/ignore-tagsRobert Schilling2014-09-191-0/+1
| |\ \ \ | | | | | | | | | | Ignore tags file.
| | * | | Ignore tags file.Ciro Santilli2014-09-191-0/+1
| | | |/ | | |/|
| * | | Merge pull request #7788 from bbodenmiller/patch-25Robert Schilling2014-09-191-1/+1
| |\ \ \ | | | | | | | | | | link to page that discusses how to generate ssh key
| | * | | link to page that discusses how to generate ssh keyBen Bodenmiller2014-09-191-1/+1
| | | | |
| * | | | Merge pull request #7797 from cirosantilli/zen-styleRobert Schilling2014-09-191-6/+4
| |\ \ \ \ | | | | | | | | | | | | Improve zen mode internals.
| | * | | | Improve zen mode internals.Ciro Santilli2014-09-191-6/+4
| | | |/ / | | |/| |
| * | | | Merge pull request #7791 from cirosantilli/patch-6Robert Schilling2014-09-191-4/+4
| |\ \ \ \ | | |_|/ / | |/| | | CONTRIBUTING typos.
| | * | | CONTRIBUTING typos.Ciro Santilli2014-09-191-4/+4
| |/ / /
| * | | Merge pull request #7774 from bbodenmiller/patch-15Robert Schilling2014-09-191-3/+3
| |\ \ \ | | |/ / | |/| | standardize capitalization
| | * | standardize capitalizationBen Bodenmiller2014-09-191-3/+3
| |/ /
| * | Merge pull request #7769 from bbodenmiller/patch-6Robert Schilling2014-09-191-1/+1
| |\ \ | | | | | | | | update rack_attack link to history page
| | * | update rack_attack link to history pageBen Bodenmiller2014-09-181-1/+1
| |/ /
| * | Merge pull request #7768 from PragTob/patch-1Robert Schilling2014-09-181-1/+1
| |\ \ | | | | | | | | Delete stray brace
| | * | Delete stray braceTobias Pfeiffer2014-09-181-1/+1
| |/ / | | | | | | * seems like a small mistake ;-)
| * | Merge pull request #7767 from bbodenmiller/patch-6Sytse Sijbrandij2014-09-181-0/+1
| |\ \ | | | | | | | | check resque.yml.example for config changes
| | * | check resque.yml.example for config changesBen Bodenmiller2014-09-181-0/+1
| | | |
* | | | Merge branch 'release-branch-earlier' into 'master'Sytse Sijbrandij2014-09-191-3/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release branch earlier Fixes #1603 See merge request !1102
| * | | | Create stable branch at 17thDmitriy Zaporozhets2014-09-191-3/+18
| | | | |
* | | | | Merge branch 'same-version-restore' into 'master'Dmitriy Zaporozhets2014-09-191-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same version restore Warn users about this. See merge request !1101
| * | | | Warn about restoring to the same version.Sytse Sijbrandij2014-09-191-1/+3
|/ / / /
* | | | Fix star/fork button UI issue if count > 100Dmitriy Zaporozhets2014-09-191-1/+1
| | | |
* | | | Merge branch 'add-semaphore-config' into 'master'Dmitriy Zaporozhets2014-09-191-19/+27
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Add semaphore config See merge request !1100
| * | | Add semaphore config to ci testing doc.Sytse Sijbrandij2014-09-191-19/+27
|/ / /
* | | Merge branch 'ci-setup-doc' into 'master'Dmitriy Zaporozhets2014-09-182-0/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI setup doc I want do describe what CI services we use See merge request !1099
| * | | Mention build scriptDmitriy Zaporozhets2014-09-181-1/+2
| | | |
| * | | CI setup docsDmitriy Zaporozhets2014-09-182-0/+33
| | |/ | |/| | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'security-in-dvcs' into 'master'Job van der Voort2014-09-182-0/+10
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | Security in dvcs Explain why access & sharing are the same. See merge request !1097
| * | Add explanation about unintentional sharing.Sytse Sijbrandij2014-09-181-0/+1
| | |
| * | Add information on information exclusivity.Sytse Sijbrandij2014-09-182-0/+9
|/ /
* | Merge pull request #7765 from bbodenmiller/patch-6Marin Jankovski2014-09-181-6/+0
|\ \ | |/ |/| remove rack attack middleware update