home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,647 Commits 48 Branches 340 Tags
758ea7520e69feeac4ffdf2a9e4e2752e5ff91fb
Commit Graph
582 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Jacob Vosmaer f04134becd New source installs should use 7-12-stable 
Even though the 7-12-stable branch does not exist yet.
 2015-06-12 14:29:18 +02:00
Jacob Vosmaer d26ae29149 Install git 2.4.3 
Git 2.1.2 does not protect against pushes trying the '.Git/config'
attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not
use the latest? (Famous last words.)
 2015-06-12 14:24:22 +02:00
Job van der Voort c857c7ff1c fix conflicts 2015-06-08 12:00:22 +02:00
Job van der Voort af1f22adad update reference to deprecated repo and update guide 2015-06-05 13:39:28 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Marin Jankovski 7044d649a3 Add autocrlf back to installation docs, add a check for it. 2015-06-03 15:42:22 +02:00
Marin Jankovski 5f7d6c7d74 Remove gitlab:env:check task. 2015-06-03 11:26:57 +02:00
Jeroen van Baarsen 8044b4d278 Merge branch 'master' into 'master' 
ADD: Note on how to setup dns hostname resolution to installation manual

Hi,

I'm suggesting to add the following note to the installation instructions. It took me some time to figure out why the test failed and why I wasn't able to push. The error messages did not point into the right direction so this might help other people with the same problems.

I hope my english is good enough, if not, please feel free to rephrase anything.

Thank you in advance,

Holger Segnitz

See merge request !236
 2015-05-27 07:11:44 +00:00
Job van der Voort bb4761d826 update download info 2015-05-20 13:05:07 +02:00
Douwe Maan fab9cbf98d Update installation/update guides for 7.11. 2015-05-15 13:12:54 +02:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Jakub Jirutka f676bbf918 Update installation instructions, make kerberos optional 2015-05-11 13:37:56 +02:00
Job van der Voort 015df037ad 7.10.4-ee packages 2015-05-11 11:58:28 +02:00
Marin Jankovski 13cabe8cb1 Revert "add 7.10.2-ee pkgs" 
This reverts commit 76383e9f02.
 2015-05-07 15:57:03 +02:00
Sytse Sijbrandij deddad6025 Document sidekiq restarting functionality. 2015-05-07 14:22:14 +02:00
Job van der Voort 76383e9f02 add 7.10.2-ee pkgs 2015-05-07 09:54:39 +02:00
Marin Jankovski cd785644de Packages for 7.10.1. 2015-05-01 16:14:46 +02:00
Job van der Voort 90c42193bd 7.10.1 pkgs 2015-04-30 11:21:22 +02:00
Job van der Voort 61c4dcdb0a new packages 2015-04-23 19:30:14 +02:00
Patricio Cano 952cc25920 Added the 7.10-ee packages. 2015-04-22 10:58:28 -05:00
Dmitriy Zaporozhets 8c72f02261 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-04-16 15:31:55 +03:00
Dmitriy Zaporozhets e24ed47f8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-16 15:29:43 +03:00
Job van der Voort bf2911685d update guides for 7.10 ee 2015-04-16 14:28:00 +02:00
Job van der Voort 42237e363b update guides for 7.10 2015-04-16 14:16:46 +02:00
Jacob Vosmaer 6b66c90573 Add 7.9.4-ee packages 2015-04-15 13:36:08 +02:00
Chulki Lee 219a7c45f7 ruby 2.1.6 
https://www.ruby-lang.org/en/news/2015/04/13/ruby-2-1-6-released/
 2015-04-13 22:11:09 -07:00
Patricio Cano d1655ea8da Added packages for 7.9.3-ee 2015-04-07 16:43:43 -05:00
Marin Jankovski 20bc37ead1 Add packages for 7.9.2. 2015-04-02 04:53:58 +02:00
Job van der Voort 025f79b683 Merge branch 'add_rugged_patch_releases' into 'master' 
Add packages for rugged patch releases

See merge request !290
 2015-04-01 11:18:13 +00:00
Marin Jankovski 6bddc8adc1 Packages for 7.9.1. 2015-03-26 19:42:02 -07:00
Marin Jankovski 47a3d6d664 Packages for 7.9.1. 2015-03-25 16:55:54 -07:00
Marin Jankovski 14947985d3 Add packages for 7.9.0 2015-03-20 21:36:30 -07:00
Dmitriy Zaporozhets 31af3f4003 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	spec/models/note_spec.rb
 2015-03-19 23:21:50 -07:00
Marin Jankovski 2bf3d9f495 Packages for 7.8.4 with openssl 1.0.1m. 2015-03-19 10:51:40 -07:00
Phil Hughes 9ffef6ca1e Changed tis to this 2015-03-19 09:57:27 +00:00
Marin Jankovski 3945ed65cf Merge remote-tracking branch 'ce/master' into ce_into_ee 
Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.9.md
 2015-03-17 15:00:13 -07:00
Marin Jankovski 9a0c99274e Update upgrade and installation docs for 7.9. 2015-03-17 14:07:05 -07:00
Dmitriy Zaporozhets d3361e6d1b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	Gemfile.lock
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/application_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/team_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/helpers/projects_helper.rb
	app/helpers/tab_helper.rb
	app/models/application_setting.rb
	app/models/user.rb
	app/views/devise/shared/_signin_box.html.haml
	app/views/groups/projects.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/projects/team_members/_form.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
	db/schema.rb
	spec/lib/gitlab/ldap/access_spec.rb
 2015-03-16 21:25:00 -07:00
Dmitriy Zaporozhets c6586b1283 Merge branch 'unicorn-workers' into 'master' 
Documentation about unicorn settings.

Helps with https://news.ycombinator.com/item?id=9213180

See merge request !1704
 2015-03-17 02:08:51 +00:00
Marin Jankovski 5c9a924fe7 Add nodejs to installation doc. 2015-03-16 13:45:27 -07:00
Sytse Sijbrandij 9269606c94 Documentation about unicorn settings. 2015-03-16 12:09:53 -07:00
Marin Jankovski 141168ad3c Change default number of unicorn workers to three. 2015-03-13 17:14:34 -07:00
Marin Jankovski 2074bafd07 Add packages for 7.8.3 and 7.8.4. 2015-03-11 18:28:31 -07:00
Marin Jankovski c5c52cc2e4 Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ee 2015-03-04 18:17:33 -08:00
Marin Jankovski 8c927937d7 Add packages for 7.8.2 2015-03-04 18:06:41 -08:00
Dmitriy Zaporozhets 811505c7ce Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/projects/team_members_controller.rb
	app/views/groups/members.html.haml
 2015-03-03 13:33:40 -08:00
Sytse Sijbrandij 3ff7189738 Clearly mark it as installation from source. 2015-03-03 10:01:49 -08:00
Dmitriy Zaporozhets c0828d6fcd Merge branch '7-9-pre' into 'master' 
Recent changes from CE master

See merge request !325
 2015-03-02 22:56:40 +00:00
Marin Jankovski e32e63ff1c Packages for 7.8.1-ee 2015-02-24 16:04:46 -08:00