home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
1658 Commits
Author SHA1 Message Date
Daniel Widerin b874cb21eb Use 'sed' with pre-search to enable only if present in redis config file. 2014-09-25 15:23:06 +00:00
Dmitriy Zaporozhets 868755777f Merge branch 'add-bugzilla' into 'master' 
Add bugzilla

See merge request !1114
 2014-09-25 13:59:24 +00:00
Daniel Widerin 18adc4f67d Fix 'Invalid socket file permissions' error 2014-09-25 11:09:46 +00:00
Jacob Vosmaer b0a4ec5ea2 Merge branch 'backup-time' into 'master' 
Backup time

The suggested backup time conflicts with daylight savings time, which occurs between 1-3am, causing the backup either to be skipped or ran twice.

See merge request !1118
 2014-09-25 07:52:23 +00:00
Jacob Vosmaer 9cd5ff043a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-25 09:50:19 +02:00
Job van der Voort 4ed5a506be set the proposed backup time to 4am 2014-09-25 09:38:17 +02:00
Jacob Vosmaer b268fa0595 Fix the sed command for increasing the backlog 2014-09-25 09:34:29 +02:00
Achilleas Pipinellis 05b535e1c0 Add missing Redis item list in Overview [ci skip]. 2014-09-24 22:59:26 +03:00
Sytse Sijbrandij de717a3335 Merge branch 'gitlab_ldap_filter' into 'master' 
Add more LDAP user_filter documentation

See merge request !1115
 2014-09-24 12:06:47 +00:00
Jacob Vosmaer 532eff6169 Add more LDAP user_filter documentation 2014-09-24 14:02:24 +02:00
Daniel Widerin d3dbd353cc Add unixsocketperm note to upgrade guide 2014-09-24 10:48:33 +00:00
Sytse Sijbrandij 41cfdd25e2 Add bugzilla to list because people ask about it. 2014-09-24 11:50:00 +02:00
Dmitriy Zaporozhets 4d5435410f Merge branch 'jubianchi-api/improve-error-reporting' into 'master' 
Merge jubianchi-api/improve-error-reporting

Closes https://github.com/gitlabhq/gitlabhq/pull/7502

See merge request !1112
 2014-09-24 09:25:55 +00:00
Sytse Sijbrandij 8d7ed7e53b Add notice about weekend in release cycle. 2014-09-24 08:42:45 +02:00
Dmitriy Zaporozhets d0e3ab5826 Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting 2014-09-23 21:35:45 +03:00
Marin Jankovski 0f7cad07d0 Add to monthly doc that reverting a feature is an option. 2014-09-23 09:03:38 +02:00
Sytse Sijbrandij 0241efba59 Use origin to compare so it is not dependent on checking out the branch before. 2014-09-23 08:40:46 +02:00
Sytse Sijbrandij b3c53efc42 Merge branch 'monthly_release_document_update' into 'master' 
Monthly release document update

See merge request !1092
 2014-09-22 17:23:47 +00:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09:49 +02:00
Marin Jankovski c108839cb9 More updates to release doc. 2014-09-22 17:26:18 +02:00
Marin Jankovski 7d7ba112b6 Issue name of QA. 2014-09-22 17:15:53 +02:00
Marin Jankovski 68bb1701cd Update monthly release doc that we are not using travis anymore. 2014-09-22 17:15:53 +02:00
Marin Jankovski 3a9c294ac0 Add steps for building and deploying gitlab.com packages to monthly release document. 2014-09-22 17:15:53 +02:00
Marin Jankovski 0b85e2a606 Order of tasks in monthly release doc. 2014-09-22 17:15:53 +02:00
Marin Jankovski 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Sytse Sijbrandij 6f61cbd162 Add wisdom about reverting a revert merge. 2014-09-22 13:10:13 +02:00
Marin Jankovski 560c41ccf2 Merge pull request #7812 from bbodenmiller/7.3-upgrade 
improve 7.3 upgrade process & redis setup
 2014-09-22 09:59:03 +02:00
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
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
Dmitriy Zaporozhets 9971a9692a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-20 19:22:42 +03: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
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
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 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
Sytse Sijbrandij db2bb8c304 Add semaphore config to ci testing doc. 2014-09-19 13:23:53 +02:00
Ben Bodenmiller 9cad1cbe32 standardize capitalization 2014-09-19 00:58:22 -07:00
Ben Bodenmiller 2b1137bd14 update rack_attack link to history page 2014-09-18 15:53:46 -07: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
Dmitriy Zaporozhets 175a913065 CI setup docs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-18 16:45:18 +03:00
Sytse Sijbrandij 664b433afe Add explanation about unintentional sharing. 2014-09-18 09:44:12 +02:00
Sytse Sijbrandij ff4a45effb Add information on information exclusivity. 2014-09-18 09:41:38 +02:00
Ben Bodenmiller 28ee311d0c remove rack attack middleware update 
Hasn't changed since 7.2 release: https://github.com/gitlabhq/gitlabhq/commits/master/config/initializers/rack_attack.rb.example
 2014-09-17 20:01:25 -07:00
Marin Jankovski 2b35c88790 Updates to the update/install docs for 7.3.rc1 2014-09-17 18:27:23 +02:00