Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Version 7.3.0. | Marin Jankovski | 2014-09-22 | 1 | -1/+1 |
| | |||||
* | Merge branch 'revert_sticky_headers' into 'master' | Marin Jankovski | 2014-09-22 | 3 | -173/+1 |
|\ | | | | | | | | | | | Revert sticky headers See merge request !1104 | ||||
| * | Revert "Diff headers made sticky." | Marin Jankovski | 2014-09-22 | 3 | -173/+1 |
|/ | | | | This reverts commit 6eb85b1a30eb2e87fc6a55d17bb38fdf535a516b. | ||||
* | Merge pull request #7815 from Razer6/zen/fix_scroll_position | Marin Jankovski | 2014-09-22 | 1 | -0/+7 |
|\ | | | | | Save last scrollposition and scroll back when leaving ZEN mode | ||||
| * | Save last scrollposition and scroll back when leaving ZEN mode | Robert Schilling | 2014-09-21 | 1 | -0/+7 |
| | | |||||
* | | Merge pull request #7812 from bbodenmiller/7.3-upgrade | Marin Jankovski | 2014-09-22 | 3 | -13/+24 |
|\ \ | | | | | | | improve 7.3 upgrade process & redis setup | ||||
| * | | improve 7.3 upgrade process & redius setup | Ben Bodenmiller | 2014-09-21 | 3 | -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-25 | Marin Jankovski | 2014-09-22 | 1 | -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.2 | Ben Bodenmiller | 2014-09-21 | 1 | -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-typo | Robert Schilling | 2014-09-21 | 2 | -2/+2 |
|\ \ | | | | | | | Typo it -> its. | ||||
| * | | Typo it -> its. | Ciro Santilli | 2014-09-21 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #7811 from bbodenmiller/patch-12 | Robert Schilling | 2014-09-21 | 2 | -5/+5 |
|\ \ \ | |_|/ |/| | | formatting improvements to 6.0-to-7.3.md | ||||
| * | | formatting improvements to upgrade guides | Ben Bodenmiller | 2014-09-21 | 2 | -5/+5 |
|/ / | |||||
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-09-20 | 13 | -37/+43 |
|\ \ | |/ | |||||
| * | Merge pull request #7805 from Razer6/improve/zen | Robert Schilling | 2014-09-20 | 1 | -0/+1 |
| |\ | | | | | | | Prevent default action when closing zen mode | ||||
| | * | Prevent default action when closing zen mode | Robert Schilling | 2014-09-20 | 1 | -0/+1 |
| |/ | |||||
| * | Merge pull request #7801 from cirosantilli/dry-zen-view | Robert Schilling | 2014-09-20 | 5 | -19/+22 |
| |\ | | | | | | | Factor zen mode. | ||||
| | * | Factor zen mode. | Ciro Santilli | 2014-09-20 | 5 | -19/+22 |
| | | | |||||
| * | | Merge pull request #7798 from spuder/issue#7763 | Sytse Sijbrandij | 2014-09-20 | 1 | -2/+4 |
| |\ \ | | | | | | | | | Adds support for ruby 1.8 in webhook example | ||||
| | * | | Adds support for ruby 1.8 in webhook example, issue #7763 | Spencer Owen | 2014-09-19 | 1 | -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-tags | Robert Schilling | 2014-09-19 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | Ignore tags file. | ||||
| | * | | | Ignore tags file. | Ciro Santilli | 2014-09-19 | 1 | -0/+1 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #7788 from bbodenmiller/patch-25 | Robert Schilling | 2014-09-19 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | link to page that discusses how to generate ssh key | ||||
| | * | | | link to page that discusses how to generate ssh key | Ben Bodenmiller | 2014-09-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge pull request #7797 from cirosantilli/zen-style | Robert Schilling | 2014-09-19 | 1 | -6/+4 |
| |\ \ \ \ | | | | | | | | | | | | | Improve zen mode internals. | ||||
| | * | | | | Improve zen mode internals. | Ciro Santilli | 2014-09-19 | 1 | -6/+4 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge pull request #7791 from cirosantilli/patch-6 | Robert Schilling | 2014-09-19 | 1 | -4/+4 |
| |\ \ \ \ | | |_|/ / | |/| | | | CONTRIBUTING typos. | ||||
| | * | | | CONTRIBUTING typos. | Ciro Santilli | 2014-09-19 | 1 | -4/+4 |
| |/ / / | |||||
| * | | | Merge pull request #7774 from bbodenmiller/patch-15 | Robert Schilling | 2014-09-19 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |/| | | standardize capitalization | ||||
| | * | | standardize capitalization | Ben Bodenmiller | 2014-09-19 | 1 | -3/+3 |
| |/ / | |||||
| * | | Merge pull request #7769 from bbodenmiller/patch-6 | Robert Schilling | 2014-09-19 | 1 | -1/+1 |
| |\ \ | | | | | | | | | update rack_attack link to history page | ||||
| | * | | update rack_attack link to history page | Ben Bodenmiller | 2014-09-18 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #7768 from PragTob/patch-1 | Robert Schilling | 2014-09-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Delete stray brace | ||||
| | * | | Delete stray brace | Tobias Pfeiffer | 2014-09-18 | 1 | -1/+1 |
| |/ / | | | | | | | * seems like a small mistake ;-) | ||||
| * | | Merge pull request #7767 from bbodenmiller/patch-6 | Sytse Sijbrandij | 2014-09-18 | 1 | -0/+1 |
| |\ \ | | | | | | | | | check resque.yml.example for config changes | ||||
| | * | | check resque.yml.example for config changes | Ben Bodenmiller | 2014-09-18 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'release-branch-earlier' into 'master' | Sytse Sijbrandij | 2014-09-19 | 1 | -3/+18 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release branch earlier Fixes #1603 See merge request !1102 | ||||
| * | | | | Create stable branch at 17th | Dmitriy Zaporozhets | 2014-09-19 | 1 | -3/+18 |
| | | | | | |||||
* | | | | | Merge branch 'same-version-restore' into 'master' | Dmitriy Zaporozhets | 2014-09-19 | 1 | -1/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Same version restore Warn users about this. See merge request !1101 | ||||
| * | | | | Warn about restoring to the same version. | Sytse Sijbrandij | 2014-09-19 | 1 | -1/+3 |
|/ / / / | |||||
* | | | | Fix star/fork button UI issue if count > 100 | Dmitriy Zaporozhets | 2014-09-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'add-semaphore-config' into 'master' | Dmitriy Zaporozhets | 2014-09-19 | 1 | -19/+27 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Add semaphore config See merge request !1100 | ||||
| * | | | Add semaphore config to ci testing doc. | Sytse Sijbrandij | 2014-09-19 | 1 | -19/+27 |
|/ / / | |||||
* | | | Merge branch 'ci-setup-doc' into 'master' | Dmitriy Zaporozhets | 2014-09-18 | 2 | -0/+34 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI setup doc I want do describe what CI services we use See merge request !1099 | ||||
| * | | | Mention build script | Dmitriy Zaporozhets | 2014-09-18 | 1 | -1/+2 |
| | | | | |||||
| * | | | CI setup docs | Dmitriy Zaporozhets | 2014-09-18 | 2 | -0/+33 |
| | |/ | |/| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
* | | | Merge branch 'security-in-dvcs' into 'master' | Job van der Voort | 2014-09-18 | 2 | -0/+10 |
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | Security in dvcs Explain why access & sharing are the same. See merge request !1097 | ||||
| * | | Add explanation about unintentional sharing. | Sytse Sijbrandij | 2014-09-18 | 1 | -0/+1 |
| | | | |||||
| * | | Add information on information exclusivity. | Sytse Sijbrandij | 2014-09-18 | 2 | -0/+9 |
|/ / | |||||
* | | Merge pull request #7765 from bbodenmiller/patch-6 | Marin Jankovski | 2014-09-18 | 1 | -6/+0 |
|\ \ | |/ |/| | remove rack attack middleware update |