Commit Graph
506 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets fd1f54b8ab Merge branch 'master' into ee-from-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	app/views/admin/groups/_form.html.haml
	app/views/groups/edit.html.haml
	app/views/groups/show.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/projects/_settings_nav.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.6.md
2014-12-26 15:05:43 +02:00
Patricio Cano 0b4b9e432b Added the new 7.6 packages links 2014-12-24 10:58:49 -05:00
Sytse Sijbrandij cdd8adcb10 Link to LDAP doc. 2014-12-24 12:48:40 +01:00
Job van der Voort d4f89dfc62 add 7.6.2 packages 2014-12-23 14:55:04 +01:00
Sytse Sijbrandij b5d0f90e30 Warn people about not exposing at a time they can still do something about it. 2014-12-23 09:48:43 +01:00
Patricio Cano 8de60c45f0 Added the new 7.6 packages links 2014-12-22 14:29:08 -05:00
Patricio Cano 918245094c Added update guide for updating to 7.6 2014-12-17 18:00:43 -05:00
Patricio Cano 7e048d5772 Updated the installation and update documentation for the 7.6 release. 2014-12-17 12:15:38 -05:00
Dmitriy Zaporozhets 2fef5c1323 Merge branch 'dev-docs-in-gdk' into 'master'
Dev docs in gdk

Also see https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/31

See merge request !1331
2014-12-17 09:49:10 +00:00
Sytse Sijbrandij 98e64610b2 Move development information to the GitLab Development Kit. 2014-12-17 08:27:03 +01:00
Dmitriy Zaporozhets dc0e6d06c5 Merge branch 'master' into ce-7-6 2014-12-16 13:21:18 +02:00
Valery Sizov 83de96ae3a add kerberos dependency 2014-12-15 14:01:55 +02:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
2014-12-11 18:12:45 +02:00
Sytse Sijbrandij bfe99a1eee Consolidate unicorn worker advise. 2014-12-08 14:41:45 +01:00
Job van der Voort f811b695f8 memory constrained unicorn workers 2014-12-08 14:21:17 +01:00
Job van der Voort b7d4184f24 advise about unicorn workers 2014-12-08 13:51:27 +01:00
Dmitriy Zaporozhets 230900b981 Merge branch 'upstream-ce' into 'master'
Upstream changes from CE

See merge request !262
2014-12-08 12:41:38 +00:00
Job van der Voort d092d271e4 Merge branch 'package-update' into 'master'
Tips for updating CE to EE with RPMs

I got an annoying error today while trying to upgrade CE to EE on Centos.

See merge request !259
2014-12-05 14:03:25 +00:00
Marin Jankovski 5f47ca0240 Update packages for 7.5.3. 2014-12-05 13:18:31 +01:00
Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
2014-12-05 13:28:32 +02:00
Jacob Vosmaer dbba454cfb Tips for updating CE to EE with RPMs 2014-12-04 15:09:29 +01:00
Sytse Sijbrandij 372cb87f05 Reword the 512 memmory advise. 2014-12-04 09:47:27 +01:00
Job van der Voort 8ab5343764 add the gl 7.5.2-ee packages 2014-12-03 15:22:46 +01:00
Marin Jankovski 79912d6870 System with 512MB of RAM can be used but swap size must be increased. 2014-12-02 14:46:16 +01:00
Marin Jankovski bff0034584 Revert "Remove the lowest memory requirement of 512MB."
This reverts commit 5cf6d5949d.
2014-12-02 14:39:58 +01:00
Sytse Sijbrandij 3e60dd7cb5 Change it earlier as well. 2014-11-26 15:49:25 +01:00
Sytse Sijbrandij 6818c96db0 Selecting a branch is dangerous now that we have rc in a branch. 2014-11-26 14:30:14 +01:00
Patricio Cano c9d4d1eec6 Fixed Ubuntu 12.04 link 2014-11-21 17:49:58 +00:00
Patricio Cano 43d17305d8 Added packages for version 7.5.1 2014-11-21 17:42:09 +00:00
Sytse Sijbrandij a4b288d737 Add installation instructions. 2014-11-20 21:46:51 +00:00
Jacob Vosmaer 98458197eb Add 7.4.5-ee packages 2014-11-20 12:10:53 +01:00
Patricio Cano da35baed65 Added update guide for updating to 7.5, and pointed installation and updates guides to new version. 2014-11-17 16:56:51 -05:00
Patricio Cano 27fc388e96 Renamed main update file to ...7.5.md, updated links and versions (Ruby to 2.1.5 and gitlab-shell to 2.2.0).
Corrected ruby download link.
2014-11-17 16:23:51 -05:00
Valery Sizov 3fcd75a911 Merge CE master into EE master
Conflicts:
	Gemfile
	VERSION
	app/assets/javascripts/project.js.coffee
	app/assets/javascripts/users_select.js.coffee
	app/controllers/projects/services_controller.rb
	app/models/project.rb
	app/views/groups/edit.html.haml
	features/project/service.feature
	features/steps/project/services.rb
	spec/models/concerns/mentionable_spec.rb
2014-11-13 17:05:12 +02:00
Marin Jankovski 5cf6d5949d Remove the lowest memory requirement of 512MB. 2014-11-12 12:54:43 +01:00
Marin Jankovski 313bee58b9 Packages for 7.4.4-ee. 2014-11-10 09:51:25 +01:00
Valeriy Sizov 46bd0a88dd Merge pull request #7652 from m-a-r-c-o/logrotate-error-bugfix
Fix log rotate permission error
2014-11-05 13:50:11 +02:00
Marin Jankovski 359d2262ab Packages for GitLab 7.4.3 and GitLab CI 5.1.0. 2014-11-04 17:12:32 +01:00
Valeriy Sizov ed68797672 Merge pull request #8196 from bbodenmiller/patch-12
clarify that 'template1=#' is part of prompt
2014-11-04 17:37:46 +02:00
Valeriy Sizov f8981e02cd Merge pull request #8197 from bbodenmiller/patch-14
Quit the database session at end of database setup
2014-11-04 17:34:30 +02:00
Job van der Voort cab8b7863f update with new packages for ee 2014-10-30 15:01:28 +01:00
Job van der Voort b6edddf4ca add 7.4.3-ee packages to list 2014-10-30 11:35:07 +01:00
Robert Schilling b8d85bc230 Merge pull request #8194 from bbodenmiller/patch-9
ruby -> Ruby
2014-10-30 08:51:39 +01:00
Ben Bodenmiller 12e751a892 Quit the database session at end of database setup 2014-10-30 00:01:19 -07:00
Ben Bodenmiller 9c6106c4f6 clarify that 'template1=#' is part of prompt
Similar to https://github.com/gitlabhq/gitlabhq/blob/master/doc/install/database_mysql.md clarify that `template1=#` is part of the prompt.
2014-10-29 23:58:34 -07:00
Ben Bodenmiller 87fa3f0d2e ruby -> Ruby 2014-10-29 21:18:57 -07:00
Ben Bodenmiller 1f62cb3ee7 fix git installation 2014-10-29 19:09:24 -07:00
Dmitriy Zaporozhets a565c51b86 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-29 13:41:29 +02:00
Jacob Vosmaer 527bbd44de Merge branch 'master' into 'master'
Close #717

This closes #717:

Add documentation changes to:

 * Set the permissions of the unix socket properly
 * Create the directory for the socket
 * Make sure tmpfiles.d persists said directory

The first change makes sure gitlabl can connect to the socket. The latter two avoid redis from failing to start on systemd-based systems, including recent versions of Debian.

You may probably want to cherry-pick this into the documentation for the latest stable release.

See merge request !224
2014-10-29 11:01:18 +00:00
Ben Bodenmiller dc4caa26bf minor requirements.md cleanup
* "Non Unix"->"Non-Unix"
* Fix poor wording
2014-10-28 09:47:57 -07:00