home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Marin Jankovski 8446f37e7c Merge pull request #7809 from bbodenmiller/patch-25 
update gitlab shell to 1.9.8 for gitlab 7.2.2
 2014-09-22 09:57:38 +02:00
Robert Schilling 28ba985ef9 Save last scrollposition and scroll back when leaving ZEN mode 2014-09-21 21:06:38 +02:00
Robert Schilling 90741c8892 Merge pull request #7814 from cirosantilli/test-typo 
Typo it -> its.
 2014-09-21 20:01:17 +02:00
Ciro Santilli b65a2d07e4 Typo it -> its. 2014-09-21 19:45:54 +02:00
Robert Schilling 3fdccd539a Merge pull request #7811 from bbodenmiller/patch-12 
formatting improvements to 6.0-to-7.3.md
 2014-09-21 16:02:02 +02:00
Ben Bodenmiller 559af04f34 improve 7.3 upgrade process & redius setup 
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
 2014-09-21 05:05:48 -07:00
Ben Bodenmiller 244513568c formatting improvements to upgrade guides 2014-09-21 04:28:47 -07:00
Ben Bodenmiller 9cf77b6604 update gitlab shell to 1.9.8 for gitlab 7.2.2 
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.
 2014-09-21 03:47:24 -07:00
Ciro Santilli ad47993ac4 Factor error and success methods from services. 2014-09-21 11:43:05 +02:00
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03:00
Robert Schilling fda61a047f Merge pull request #7805 from Razer6/improve/zen 
Prevent default action when closing zen mode
 2014-09-20 18:17:19 +02:00
Robert Schilling d5badd7ef6 Prevent default action when closing zen mode 2014-09-20 18:15:36 +02:00
Ciro Santilli eb033aa60e Factor issue and MR edit form error list. 2014-09-20 18:02:01 +02:00
Robert Schilling 8fd0d74bd8 Merge pull request #7801 from cirosantilli/dry-zen-view 
Factor zen mode.
 2014-09-20 17:09:20 +02:00
Ciro Santilli adaec60a50 Factor zen mode. 2014-09-20 15:32:46 +02:00
Sytse Sijbrandij 82956a03c7 Merge pull request #7798 from spuder/issue#7763 
Adds support for ruby 1.8 in webhook example
 2014-09-20 11:57:12 +02:00
Dmitriy Zaporozhets 6485570482 Increase atom feed test coverage. Prevent 500 error if description is missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-20 11:55:58 +03:00
Ciro Santilli 0576c028cc Set textarea resize:vertical by default. 2014-09-19 23:16:02 +02:00
Spencer Owen b9f0508732 Adds support for ruby 1.8 in webhook example, issue #7763 
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
 2014-09-19 13:38:12 -06:00
Robert Schilling 24c79205c4 Merge pull request #7771 from cirosantilli/ignore-tags 
Ignore tags file.
 2014-09-19 20:44:12 +02:00
Robert Schilling d40311a91d Merge pull request #7788 from bbodenmiller/patch-25 
link to page that discusses how to generate ssh key
 2014-09-19 20:34:34 +02:00
Robert Schilling 9c08ce63dd Merge pull request #7797 from cirosantilli/zen-style 
Improve zen mode internals.
 2014-09-19 20:18:13 +02:00
Sytse Sijbrandij 71a76f5162 Merge branch 'release-branch-earlier' into 'master' 
Release branch earlier

Fixes #1603

See merge request !1102
 2014-09-19 16:00:44 +00:00
Dmitriy Zaporozhets 9017362889 Merge branch 'same-version-restore' into 'master' 
Same version restore

Warn users about this.

See merge request !1101
 2014-09-19 15:55:05 +00:00
Dmitriy Zaporozhets 4bf3abe2b8 Create stable branch at 17th 2014-09-19 15:44:21 +00:00
Sytse Sijbrandij 7121b4a488 Warn about restoring to the same version. 2014-09-19 17:39:25 +02:00
Ciro Santilli 04ef3ddc6c Improve zen mode internals. 2014-09-19 17:32:23 +02:00
Ciro Santilli 29a0d993b0 Factor .add-diff-note active state. 2014-09-19 16:16:45 +02:00
Dmitriy Zaporozhets fe314d460e Refactor coverage tools usage 
rspec spec # no coverage generated
SIMPLECOV=true rspec spec # generate coverage locally into ./coverage
COVERALLS=true rspec spec # generate and send coverage data to coveralls.io

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 16:39:56 +03:00
Dmitriy Zaporozhets 6298e55795 Merge branch 'simplecpov-update-0.9.0' of https://gitlab.com/twk3/gitlab-ce into 7-4-pre 2014-09-19 16:17:18 +03:00
Dmitriy Zaporozhets eb764b1b7b Fix star/fork button UI issue if count > 100 2014-09-19 12:33:09 +00:00
Ciro Santilli 9439602edc Fix link_to_reply_diff. 2014-09-19 14:15:24 +02:00
Robert Schilling c759b8c99e Merge pull request #7791 from cirosantilli/patch-6 
CONTRIBUTING typos.
 2014-09-19 13:59:41 +02:00
Dmitriy Zaporozhets cbff0155fa Merge branch 'add-semaphore-config' into 'master' 
Add semaphore config

See merge request !1100
 2014-09-19 11:48:28 +00:00
Ciro Santilli eb819c1e4f CONTRIBUTING typos. 2014-09-19 13:39:49 +02:00
Sytse Sijbrandij db2bb8c304 Add semaphore config to ci testing doc. 2014-09-19 13:23:53 +02:00
Dmitriy Zaporozhets aca574d0f4 Ask coveralls to merge results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-19 13:07:58 +03:00
Ben Bodenmiller 9a1fe30682 link to page that discusses how to generate ssh key 2014-09-19 02:17:22 -07:00
Robert Schilling 9790598b14 Merge pull request #7774 from bbodenmiller/patch-15 
standardize capitalization
 2014-09-19 10:01:45 +02:00
Ben Bodenmiller 9cad1cbe32 standardize capitalization 2014-09-19 00:58:22 -07:00
Ciro Santilli ee8be80ce7 Ignore tags file. 2014-09-19 08:52:42 +02:00
Robert Schilling ac516abe95 Merge pull request #7769 from bbodenmiller/patch-6 
update rack_attack link to history page
 2014-09-19 07:48:17 +02:00
Ben Bodenmiller 2b1137bd14 update rack_attack link to history page 2014-09-18 15:53:46 -07:00
Robert Schilling f56877a9ea Merge pull request #7768 from PragTob/patch-1 
Delete stray brace
 2014-09-18 19:20:26 +02:00
Dmitriy Zaporozhets e4bc359841 Fix dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 20:19:11 +03:00
Tobias Pfeiffer 0311efcbf0 Delete stray brace 
* seems like a small mistake ;-)
 2014-09-18 18:39:30 +02:00
Sytse Sijbrandij 9079441dbb Merge pull request #7767 from bbodenmiller/patch-6 
check resque.yml.example for config changes
 2014-09-18 18:19:40 +02:00
Ben Bodenmiller c36b06e468 check resque.yml.example for config changes 2014-09-18 08:21:20 -07:00
Dmitriy Zaporozhets d8b8be4409 Merge branch 'ci-setup-doc' into 'master' 
CI setup doc

I want do describe what CI services we use

See merge request !1099
 2014-09-18 15:15:09 +00:00
Dmitriy Zaporozhets c0cecdb08a Mention build script 2014-09-18 15:14:40 +00:00