home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,431 Commits 48 Branches 340 Tags
e151bbbb285c8eafe4fe8aff06d225fef71e520e
Commit Graph
1512 Commits
Author SHA1 Message Date
Marin Jankovski 25ecbf5650 Update the jira integration doc. 2014-09-26 15:32:40 +02:00
Sytse Sijbrandij 00b5ceabda Jira should be next to the external issue trackers. 2014-09-24 12:00:58 +02:00
Marin Jankovski 46df52703f Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2014-09-24 11:08:28 +02:00
Jacob Vosmaer 52fb3f22cb Restore JIRA documentation link 2014-09-24 11:05:17 +02:00
Marin Jankovski 1d63d07307 Packages for 7.3.1-ee 2014-09-24 10:33:12 +02:00
Marin Jankovski 95aef84509 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 18:11:43 +02:00
Marin Jankovski 441237eea5 Update doc that 7.3 is released. 2014-09-22 18:09:49 +02:00
Marin Jankovski fa333ecbaa Packages for 7.3.0-ee. 2014-09-22 16:23:49 +02:00
Marin Jankovski 716d6d9e90 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
 2014-09-22 15:35:09 +02:00
Marin Jankovski 457caaae49 Update manual installation guide for the correct shell version. 2014-09-22 14:50:06 +02:00
Marin Jankovski 4ddabdd793 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-09-22 14:38:02 +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
Marin Jankovski 9531e59273 Update md5 of centos7 package. 2014-09-19 12:59:46 +02:00
Marin Jankovski 2208968b91 Add 7.2.2-ee packages. 2014-09-19 11:45:00 +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
Marin Jankovski df3ea809f8 Add 7.3 update from ce to ee doc. 2014-09-18 10:01:14 +02: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 36a9e47d70 Merge remote-tracking branch 'CE/master' into merge_ce_rc1 
Conflicts:
	Gemfile.lock
	VERSION
	doc/README.md
	doc/install/installation.md
 2014-09-17 18:36:14 +02:00
Marin Jankovski 2b35c88790 Updates to the update/install docs for 7.3.rc1 2014-09-17 18:27:23 +02:00
Job van der Voort 553680d04e Merge branch 'doc/welcome_message' into 'master' 
Document the extra.sign_in_text setting for CE

See merge request !1027
 2014-09-17 08:22:28 +00:00
Marin Jankovski 2ad6789216 Merge remote-tracking branch 'CE/master' into merge_ce_7_3_to_ee 2014-09-16 12:55:21 +02:00
Marin Jankovski 71e0554449 Merge branch 'order_mr_api' into 'master' 
API MR ordering

Fixes #1477

See merge request !1076
 2014-09-16 06:46:17 +00:00
Dmitriy Zaporozhets 892371bc22 Merge branch 'redis_socket' into 'master' 
Use sockets to connect to Redis

See merge request !1088
 2014-09-15 14:49:02 +00:00
Marin Jankovski b99b2e60d5 Ordering and sorting for MR in api. 2014-09-15 11:54:49 +02:00
Jacob Vosmaer e93523ed31 Merge commit '79190fe06b' into merge-79190fe06b-7.3.0-pre 
Conflicts:
	Gemfile
	README.md
	VERSION
	db/schema.rb
	doc/install/installation.md
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/user.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2014-09-15 11:24:51 +02:00
Robert Schilling b3a88a0fdc Merge pull request #7528 from exromany/patch-1 
Update user_management.md
 2014-09-13 23:12:21 +02:00
Robert Schilling 5ac019946f Merge pull request #7743 from bbodenmiller/patch-12 
formatting changes, table->database
 2014-09-12 18:43:28 +02:00
Jacob Vosmaer 5704e6fee9 Use sockets to connect to Redis 2014-09-12 14:59:58 +02:00
Robert Schilling a6084a7608 Merge pull request #7439 from bbodenmiller/patch-6 
set the number of workers to # of cores
 2014-09-12 11:37:54 +02:00
Ben Bodenmiller ee6ec5bd6d set the number of workers to # of cores 2014-09-12 02:22:43 -07:00