Commit Graph
566 Commits
Author SHA1 Message Date
Marin Jankovski 13cabe8cb1 Revert "add 7.10.2-ee pkgs"
This reverts commit 76383e9f02.
2015-05-07 15:57:03 +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
Dmitriy Zaporozhets 976e18bb33 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 7-9-pre
Conflicts:
	app/views/groups/show.html.haml
	app/views/projects/team_members/index.html.haml
	config/routes.rb
2015-02-23 23:56:59 -08:00
Marin Jankovski 2feaa69cd5 Update version of gitlab-shell in the installation and update documentation. 2015-02-23 23:10:35 -08:00
Marin Jankovski b727d8307e Add packages for 7.8.0-ee. 2015-02-21 22:02:18 -08:00
Marin Jankovski 7644bacc9e Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.8.md
2015-02-16 20:30:21 -08:00
Patricio Cano 1f63058c5e Updated guides for 7.8-ee 2015-02-16 18:08:40 -08:00
Patricio Cano d11c64a67f Updated the installation and update guides 2015-02-16 17:51:29 -08:00
Marin Jankovski 7d9ef1124e Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
	README.md
	app/assets/javascripts/project.js.coffee
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_services/jira_service.rb
	app/models/service.rb
	app/models/user.rb
	app/services/git_push_service.rb
	config/initializers/1_settings.rb
	config/routes.rb
	db/schema.rb
	doc/integration/README.md
	doc/integration/external-issue-tracker.md
	doc/integration/github.md
	spec/controllers/import/github_controller_spec.rb
	spec/helpers/merge_requests_helper.rb
	spec/lib/gitlab/upgrader_spec.rb
	spec/models/note_spec.rb
	spec/requests/api/groups_spec.rb
	spec/services/git_push_service_spec.rb
2015-02-16 11:50:30 -08:00
Patricio Cano 2df8a91c82 Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar. 2015-02-16 09:10:07 -08:00
Ewan Edwards 93bd185efe Fix two broken links in the installation section. 2015-02-11 08:49:37 -08:00
Dmitriy Zaporozhets 9b140b22fb Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
	Gemfile.lock
	app/helpers/tab_helper.rb
	config/routes.rb
	db/schema.rb
2015-02-04 18:19:22 -08:00
Marin Jankovski d685d45222 Merge branch 'consolidate_ssh_docs' into 'master'
Consolidate SSH docs

The two available SSH topics were quite short, so it made sense to combine them.

Includes fixes a few missing words, punctuation.

See merge request !328
2015-02-04 17:11:38 +00:00
Ewan Edwards ad6c372eee Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
2015-02-03 15:18:40 -08:00
Robert Schilling 0e896aa9e9 Update gitlab-shell to 2.4.2 for 7.7 install/update guide
closes #8718, closes #8721
2015-02-03 11:44:55 +01:00
Marin Jankovski 45349abdb2 Correct the CentOS 6 package link 2015-02-02 11:21:26 -08:00
Jacob Vosmaer 1015dfbe4d Fix Ubuntu 14.04 download link for 7.7.2-ee 2015-02-02 10:17:40 +01:00