home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 06:36:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 48 Branches 340 Tags
b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0
Commit Graph
490 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0fd7d3ebe0 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-10 16:01:53 +02:00
Achilleas Pipinellis 8ab6bd3eb3 Do a git checkout on Gemfile.lock and schema.rb prior to update. Fixes #2227 2015-08-07 22:13:18 +03:00
Achilleas Pipinellis c90e592e91 Replace relative url with full path, remove old reference for indexes 
Closes #2176 (gitlab.com)
 2015-08-05 08:38:40 +03:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Dmitriy Zaporozhets 070d6a2452 Merge branch 'fix-ed' into 'master' 
Fix path to move_drop_indexes.ed

Small documentation fix.

See merge request !1900
 2015-07-14 12:08:26 +00:00
Job van der Voort f15946dd16 update guides for 712 and 713 2015-07-14 11:58:16 +02:00
Jacob Vosmaer e26e46db2c Fix path to move_drop_indexes.ed 2015-07-14 11:50:01 +02:00
Job van der Voort 80afd4c594 create update guides for 7.13 2015-07-14 11:49:53 +02:00
Jacob Vosmaer 9ba0079c51 Add 'ed' step to mysql-to-postgres procedure 
Introduced in
https://github.com/gitlabhq/mysql-postgresql-converter/commit/b2d1599706f532e1bac836243f25e005c816ef14
 2015-07-13 18:14:26 +02:00
Kamil Trzcinski 69c659ebd3 Compress database backup 2015-07-06 17:14:17 +02:00
Dmitriy Zaporozhets ae713ae8fc Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	doc/README.md
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.12.md
	doc/workflow/README.md
 2015-06-17 11:25:59 +02:00
Jacob Vosmaer 5019a7f314 Move mention of git 2.1.2 to intro paragraph 2015-06-12 15:32:43 +02:00
Jacob Vosmaer 6ec4da5d01 Add 7.12 update guides 2015-06-12 15:24:11 +02:00
Job van der Voort c857c7ff1c fix conflicts 2015-06-08 12:00:22 +02:00
Job van der Voort af1f22adad update reference to deprecated repo and update guide 2015-06-05 13:39:28 +02:00
Dmitriy Zaporozhets 935fc796d1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/controllers/admin/application_settings_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/helpers/application_settings_helper.rb
	app/models/user.rb
	app/services/files/base_service.rb
	app/views/profiles/accounts/show.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.11.md
	doc/workflow/README.md
	lib/gitlab/markdown/external_issue_reference_filter.rb
	lib/gitlab/reference_extractor.rb
	lib/gitlab/upgrader.rb
 2015-06-05 11:40:36 +02:00
Job van der Voort 4ecaf57301 Merge branch 'ce-to-ee' into 'master' 
CE to EE

Fixes gitlab/gitlabhq#2330

See merge request !396
 2015-05-15 11:36:05 +00:00
Douwe Maan 2ff2f5bf6e Update installation/update guides for 7.11. 2015-05-15 13:13:09 +02:00
Douwe Maan fab9cbf98d Update installation/update guides for 7.11. 2015-05-15 13:12:54 +02:00
Dmitriy Zaporozhets 1af8b1e4f8 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/views/help/index.html.haml
	lib/gitlab/git_access.rb
	public/500.html
	public/502.html
 2015-05-15 13:29:58 +03:00
Sytse Sijbrandij cc0a4b7ee8 Merge requests are welcome in spite of the deprecation. 2015-05-13 12:16:05 +00:00
Dmitriy Zaporozhets b2d45bb544 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Conflicts:
	app/controllers/uploads_controller.rb
	app/helpers/application_helper.rb
	app/models/note.rb
	app/services/test_hook_service.rb
	db/schema.rb
	spec/models/note_spec.rb
 2015-05-13 14:10:14 +03:00
Sytse Sijbrandij 82dec4b49b remove strange code branchets 2015-05-13 10:08:48 +00:00
Sytse Sijbrandij cfef2a11d9 Deprecate the upgrader script since we forget to update it. 2015-05-13 10:08:04 +00:00
Douwe Maan 8acd705c8a Update docs in line with mysql-postgresql-converter changes. 2015-05-12 13:36:20 +02:00
Job van der Voort 415648e255 revert to 7.10.1 2015-05-07 13:39:10 +00:00
Job van der Voort 895bc33fef Update upgrader doc to point to 7.10.2 2015-05-07 12:24:18 +00:00
Douwe Maan 68ac20604b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	app/controllers/groups/application_controller.rb
#	app/services/test_hook_service.rb
#	app/views/admin/groups/show.html.haml
#	app/views/groups/_settings_nav.html.haml
#	app/views/groups/show.html.haml
#	app/views/layouts/_head.html.haml
#	app/views/projects/_settings_nav.html.haml
#	db/schema.rb
#	features/project/project.feature
#	features/steps/project/project.rb
 2015-05-05 10:18:27 +02:00
Robert Schilling 0d0c539c04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-03 10:28:52 +02:00
Jeroen van Baarsen 76f7bdccc0 Merge pull request #8669 from robotroll/patch-1 
Update 7.6-to-7.7.md
 2015-05-01 08:38:02 +02:00
Douwe Maan cb40918930 Update upgrader doc to point to 7.10.1. 2015-04-30 22:14:19 +02:00
Joeri Verdeyen 81f6495858 Update 7.9-to-7.10.md 2015-04-30 13:22:28 +02:00
Dmitriy Zaporozhets f502b293e5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
	spec/helpers/gitlab_markdown_helper_spec.rb
 2015-04-24 11:22:54 +03:00
Marin Jankovski aac2755045 Merge pull request #8996 from vinkla/patch-1 
Fix Node.js Error in Documentation
 2015-04-23 09:08:34 +02:00
Marin Jankovski 8b4d1b78e9 Move the upgrade document to the correct location. 2015-04-23 09:05:30 +02:00
Vincent KlaiberandVincent Klaiber 3a8bcea2e7 Fix nodejs installation guide in documentation. 2015-04-23 08:35:17 +02:00
Douwe Maan 7d49b9656c Update command in upgrader docs to work with 7.10.0. 2015-04-22 21:09:40 +02:00
Douwe Maan c7dc95d1d1 7.10 requires gitlab-shell 2.6.2. 2015-04-21 11:00:26 +02:00
Robin Gauß ac509359b8 Fix link to gitlab.yml.example in paragraph 5 2015-04-17 15:00:14 +02: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
Dmitriy Zaporozhets d01d0c02b7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb
 2015-04-15 19:22:57 +03: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
Jeroen van Baarsen 4cf25eea3a Merge pull request #8546 from h0ru5/patch-1 
add necessary dir for uploads in update to 6.7
 2015-04-08 10:07:17 +02:00
Dmitriy Zaporozhets 3840549566 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/assets/javascripts/dispatcher.js.coffee
	features/admin/settings.feature
	features/steps/admin/settings.rb
	features/steps/user.rb
	features/user.feature
	lib/gitlab/git_access.rb
 2015-03-25 09:16:09 -07:00
Paul Beattie e15d154b1c Updated upgrader to highlight nodejs as required package [ci skip] 2015-03-22 22:41:21 +00:00
Dmitriy Zaporozhets a05cc636d7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 
Conflicts:
	app/helpers/oauth_helper.rb
	db/schema.rb
 2015-03-21 20:41:10 -07:00
Vinnie Okada 5f86c08b2a Fix link in patch update guide 2015-03-21 11:29:24 -06:00