home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,779 Commits 48 Branches 340 Tags
bb57ee0260989be29213e8c514b56d4075ff0f0f
Commit Graph
534 Commits
Author SHA1 Message Date
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
Marin Jankovski 99e0d954d0 Packages for 7.2.2-ee and 5.4.2 CI. 2015-01-29 23:32:47 -08:00
Marin Jankovski 749137173e Packages for 7.7.1. 2015-01-22 23:43:15 -08:00
Dmitriy Zaporozhets 2bfd4f4438 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb
 2015-01-21 17:05:31 -08:00
Marin Jankovski 28af1190e3 Packages for 7.7.0-ee. 2015-01-21 13:50:14 -08:00
Dmitriy Zaporozhets 67b42e26cf Fix shell version in manual installation doc 2015-01-15 17:23:22 -08:00
Marin Jankovski 4b9ad8394e New packages for 7.6.3-ee. 2015-01-08 11:54:18 +01:00
Patricio Cano 5d26eeac0c Fixed version number in RMP hint 2014-12-31 10:09:15 -05:00
Patricio Cano 503b40f2c5 Fixed link names 2014-12-31 10:07:49 -05:00
Patricio Cano c3d97902e7 Added the new 7.6.3 packages links 2014-12-31 10:05:07 -05:00
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