home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,239 Commits 48 Branches 340 Tags
bbcb70a9dc6d494ec0bd2d4e298075a2ebcec1d5
Commit Graph
396 Commits
Author SHA1 Message Date
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 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
Alvaro Naveda 76e3b8c659 Fixed markdown error in 7.3-to-7.4 update guide 
Just fixed a minor bug in the markdown notation
 2014-10-31 11:55:56 +01:00
Sytse Sijbrandij a1dda564b1 Revert "Change update recommendation" since it should be fixed with 
c3104abfd4

This reverts commit 8101640c33.
 2014-10-30 14:59:05 -07:00
Dmitriy Zaporozhets 8431db3326 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-10-30 16:17:48 +02:00
Sytse Sijbrandij 1d0f638248 Don't update GitLab Shell to the latest version but to the corresponding version. 2014-10-28 10:57:30 -07:00
Ben Bodenmiller 6093d4fd83 fix markdown formatting 
fix markdown formatting issue
 2014-10-27 23:28:02 -07:00
Drew Blessing 8101640c33 Change update recommendation 2014-10-27 08:30:57 -05:00
Valery Sizov 21e8f43af3 Merge branch 'master' into 7-4-stable 
Conflicts:
	CHANGELOG
	VERSION
 2014-10-27 12:08:44 +02:00
Valery Sizov 348d03b13f Merge branch '7-4-stable' into 7-4-stable-ee 2014-10-21 19:15:03 +03:00
Valery Sizov be80837a69 Update Guide: Change path to nginx config 2014-10-21 19:12:52 +03:00
Jacob Vosmaer b78cd70d33 Merge pull request #8046 from bbodenmiller/patch-3 
fix permission issue in upgrade guide
 2014-10-21 13:06:01 +02:00
Valery Sizov 91402ac0eb Merge branch '7-4-stable' into ee_stable 2014-10-21 13:48:16 +03:00
Valery Sizov b1e60cfa1b remove unnecessary parts from update doc 2014-10-21 13:20:59 +03:00
Valeriy Sizov f28df34a4d Merge pull request #8065 from bbodenmiller/patch-17 
[7.4 rc fix] [doc] clarify when database.yml needs to be updated
 2014-10-21 13:03:25 +03:00
Valeriy Sizov e73a4eeafb Merge pull request #8066 from bbodenmiller/patch-18 
[7.4 rc fix] [doc] stop gitlab before mysql optimizations, run checks
 2014-10-21 13:01:54 +03:00
Valeriy Sizov 62929caf29 Merge pull request #8067 from bbodenmiller/patch-19 
[7.4 rc fix] [doc] actually give command necessary to update unicorn
 2014-10-21 13:01:04 +03:00
Valeriy Sizov bc56de15b5 Merge pull request #8070 from bbodenmiller/patch-22 
[7.4 rc fix] [doc] stop gitlab before backup
 2014-10-21 12:47:54 +03:00
Valeriy Sizov 2dd94657dc Merge pull request #8071 from bbodenmiller/patch-7 
[7.4 rc fix] [doc] add missing configure Redis to use sockets
 2014-10-21 12:44:42 +03:00
Ben Bodenmiller 4880b91ff1 add optimizations for mysql to 6.x->7.4 guide 
Add mysql optimizations from 7.3-to-7.4.md.
 2014-10-18 02:13:15 -07:00
Ben Bodenmiller 0ff6105589 add missing configure Redis to use sockets 
Add details from 7.2-to-7.3.md. Replaces https://github.com/gitlabhq/gitlabhq/pull/8047.
 2014-10-18 02:08:01 -07:00