home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
15,081 Commits 48 Branches 340 Tags
1308a8a0ef27ea241301ab0585647761a2ffeb0e
Commit Graph
415 Commits
Author SHA1 Message Date
Valery Sizov 45ec0d255d Merge remote-tracking branch 'ee/master' into ce_non_conflict 
Conflicts:
	app/helpers/oauth_helper.rb
	app/helpers/projects_helper.rb
 2015-02-05 22:01:05 -08:00
Jeroen van Baarsen eb39022674 Merge pull request #8318 from bbodenmiller/patch-9 
add editor command to update database.yml; cleanup
 2015-02-05 20:05:30 +01: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
Sytse Sijbrandij 21b742a027 Merge branch 'master' into 'master' 
Fix capitalization of URL.

A targeted fix in the documentation.

See merge request !323
 2015-02-03 23:12:40 +00: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
Ewan Edwards e6e337088b Make all non-config/non-operational mentions of URL consistently 
capitalized.

Make the plural version consistently "URLs".

Fix an instance where the article "the" before URL was missing.
 2015-01-30 10:24:45 -08:00
Jacob Vosmaer 1a1d7085fa Mention libkrb5-dev dependency 2015-01-30 16:03:27 +01: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
Valery Sizov fe1e3db5a3 fix url in update doc 2015-01-19 14:18:31 -08:00
Valery Sizov b63e6e5abc fix url in update doc 2015-01-19 14:14:00 -08:00
Valery Sizov d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Robert Schilling 5ee99290be Update gitlab-shell in docs to 2.4.1 2015-01-18 13:04:58 +01:00
Dmitriy Zaporozhets b620aa0b9b 7.7 CE to EE update guide 2015-01-14 17:55:26 -08:00
Dmitriy Zaporozhets 7cf49f8c4a Merge branch 'ce-master' 
Conflicts:
	doc/update/6.x-or-7.x-to-7.7.md
 2015-01-14 17:53:36 -08:00
Dmitriy Zaporozhets 973449b567 Update guides for CE 2015-01-14 17:40:35 -08:00
Dmitriy Zaporozhets a7dddd1bca Create update doc for 7.7 2015-01-14 17:34:39 -08: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
Jeroen van Baarsen 334f240899 Merge pull request #8362 from bbodenmiller/patch-3 
add missing password prompt to mysqldump
 2014-12-23 16:41:20 +01:00
Sytse Sijbrandij e2c9a486d7 Note that it is default on Ubuntu. 2014-12-23 10:11:56 +01:00
Sytse Sijbrandij 9c7a7d4349 Add libkrb5-dev dependency. 2014-12-23 09:23:19 +01:00
Xavier Perseguers 1e22b494e2 [BUGFIX] Invalid branch in comparison 2014-12-19 13:49:33 +01:00
Patricio Cano 7813363fd7 Fixed version reference 2014-12-17 18:02:58 -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 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
Jeroen van Baarsen ba4fe47606 Merge pull request #8374 from bbodenmiller/7-5-update-fix 
remove extra upgrade details, add missing config
 2014-12-14 18:31:37 +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
Marin Jankovski 7bf50c8e1d Merge pull request #8376 from bbodenmiller/7-6-upgrade-guide 
add preliminary 7.6 upgrade guide
 2014-12-01 16:55:18 +01:00
Achilleas Pipinellis 824ad40699 Make clear that the upgrader script does not update gitlab-shell. 2014-11-29 12:01:32 +02:00
Robert Schilling 5f65310fcd Merge pull request #8319 from bbodenmiller/patch-12 
start gitlab after mysql tweaks
 2014-11-23 18:37:09 +01:00
Ben Bodenmiller 8e6ff86d38 add editor command to update database.yml; cleanup 2014-11-23 02:32:23 -08:00
Ben Bodenmiller 44e53aefd4 start gitlab after mysql tweaks 2014-11-23 02:28:34 -08:00
Ben Bodenmiller 80db117a33 add preliminary 7.6 upgrade guide 
Add preliminary 7.6 upgrade guide. Makes it easier to add upgrades as changes are made rather than trying to round up everything at RC1.

Initial additions:
* Nginx changes needed again in 7.6 as they did not make the final 7.5 upgrade guide
* Suggest that user sets time zone (added in https://github.com/gitlabhq/gitlabhq/pull/8015 but missed in final 7.5 upgrade guide)

Replaces https://github.com/gitlabhq/gitlabhq/pull/8124
 2014-11-23 01:45:44 -08:00
Ben Bodenmiller 7cfaf890cb remove extra upgrade details, add missing config 
Update 7.5 update guide:

* Remove unnecessary upgrade details (they were completed in 7.4 upgrade and only needed one time)
* Add missing Nginx config details
 2014-11-23 01:08:29 -08:00
Ben Bodenmiller 4a39b6d9f7 add missing password prompt to mysqldump 2014-11-20 08:15:58 -08:00
Job van der Voort 2e0bbe68cb you have to update gitlab shell for gitlab 7.5 2014-11-20 15:58:03 +01:00
Patricio Cano c2a04705d6 Fixed typo in link to config sample. 2014-11-18 16:13:03 -05: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 7d29327381 Point gitlab-shell config example to v2.2.0 tag 2014-11-17 16:39:16 -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
Patricio Cano 0b1bac132e Added new update guides for latest version 7.5 2014-11-17 16:21:40 -05:00
Ben Bodenmiller 5b5446bd76 remove extra cd command 2014-11-15 06:25:08 -08: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
Dmitriy Zaporozhets 868a08d14c Merge branch 'automate-upgrader-shell-version' into 'master' 
Automate upgrader shell version

/cc @marin

See merge request !1237
 2014-11-11 09:22:09 +00:00
Patricio Cano 1a900b2248 Removed upgrade notice, since it is no longer needed. 2014-11-10 15:00:08 -05:00
Patricio Cano 34c241e141 Added upgrade notice to point to CentOS users to upgrade to 7.3 first 2014-11-06 13:06:00 -05:00
Sytse Sijbrandij bc0cf74589 Make GitLab Shell upgrade a natural part of the upgrade process. 2014-11-02 15:13:30 -08:00