Commit Graph
494 Commits
Author SHA1 Message Date
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
Dmitriy Zaporozhets ec4a079099 Merge pull request #7976 from bbodenmiller/patch-9
support latest firefox esr release
2014-10-28 14:07:42 +02:00
Jacob Vosmaer 36b68a556f Add 7.4.2-ee packages 2014-10-24 20:52:38 +02:00
Jacob Vosmaer b86d15e97e Add 7.4.1-ee packages 2014-10-24 16:15:36 +02:00
Hugo Osvaldo Barrera add5d43b6e Close #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.
2014-10-23 14:01:44 -03:00
Marin Jankovski f4e701c029 Correct header for packages section. 2014-10-22 18:02:33 +02:00
Marin Jankovski e2d83fbc82 Packages for 7.4.0-ee. 2014-10-22 18:01:55 +02:00
Valery Sizov f59b692420 Merge branch 'gitlab-ee/master' into 7-4-stable_
Conflicts:
	VERSION
	doc/install/installation.md
2014-10-17 20:35:51 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +03:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +02:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
2014-10-14 18:23:51 +03:00
Sytse Sijbrandij 3fff9aa34f Merge pull request #7981 from cirosantilli/www-to-about
Replace www.gitlab.com with about.gitlab.com
2014-10-08 09:46:51 +02:00