Commit Graph
1659 Commits
Author SHA1 Message Date
Job van der Voort b6edddf4ca add 7.4.3-ee packages to list 2014-10-30 11:35:07 +01:00
Jacob Vosmaer 36b68a556f Add 7.4.2-ee packages 2014-10-24 20:52:38 +02:00
Jacob Vosmaer b86d15e97e Add 7.4.1-ee packages 2014-10-24 16:15:36 +02:00
Marin Jankovski f4e701c029 Correct header for packages section. 2014-10-22 18:02:33 +02:00
Marin Jankovski e2d83fbc82 Packages for 7.4.0-ee. 2014-10-22 18:01:55 +02:00
Dmitriy Zaporozhets 67d6a79ee9 Merge branch 'ce-ee-master' into ee-master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	config/initializers/1_settings.rb
	config/initializers/7_omniauth.rb
2014-10-22 14:47:04 +03: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 VosmaerandValery Sizov e88cf107bc Add instructions for multiple LDAP servers 2014-10-21 16:16:17 +03: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
Robert Schilling 489d9cdaab Merge pull request #8017 from mr-vinn/md-table-doc
Document Markdown table formatting issue
2014-10-20 07:49:51 +02: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
Ben Bodenmiller 3e6b284bd0 stop gitlab before backup 2014-10-18 01:51:35 -07:00
Ben Bodenmiller 9a92e53f62 stop gitlab before backup
Stopping gitlab before backup ensures that backup has everything before upgrade incase something goes wrong. Also remove extra cd.
2014-10-18 01:49:59 -07:00
Ben Bodenmiller 76e2ae8148 actually give command necessary to update unicorn
Give command to update unicorn.rb rather than just say you need to do it.
2014-10-18 01:39:01 -07:00
Ben Bodenmiller 35b1a036d7 stop gitlab before mysql optimizations, run checks
Update MySQL optimizations to reflect doing updates after GitLab has already been started back up.
2014-10-18 01:33:51 -07:00
Ben Bodenmiller 768da57fe4 clarify when database.yml needs to be updated
Clarify that database.yml should be updated if you are running a MySQL Database. Remove wording that de-emphasises importance of update.
2014-10-18 01:28:50 -07:00
Dmitriy Zaporozhets ba84d01c3c Merge branch '7-4-stable_' into '7-4-stable-ee'
7-4-stable CE to EE

See merge request !207
2014-10-17 17:42:53 +00:00
Valery Sizov f59b692420 Merge branch 'gitlab-ee/master' into 7-4-stable_
Conflicts:
	VERSION
	doc/install/installation.md
2014-10-17 20:35:51 +03:00
Valery Sizov 39b229cf4c added uopdate guide 2014-10-17 14:14:35 +03:00
Valery Sizov 4da88dbb2d documents updated 2014-10-17 13:47:20 +03:00
Valery Sizov 7af04fe1b2 ce-upstream 2014-10-16 15:21:28 +03:00
Achilleas Pipinellis c2bcdeb950 Make semaphore configuration an ordered list. 2014-10-15 20:52:39 +03:00
Achilleas Pipinellis b57ec54fae Point to correct project on githost.io. 2014-10-15 20:25:47 +03:00
Sytse Sijbrandij e8e022daec Refer to the Omnibus installation from eveerywhere since people link to installation.md directly. 2014-10-15 16:29:05 +02:00
Dmitriy Zaporozhets 3f1c95c638 Merge branch 'no_red_builds_policy' into 'master'
No red builds policy

Related to gitlab/organization#63

See merge request !1182
2014-10-15 13:09:23 +00:00
Dmitriy Zaporozhets 8200992991 Merge branch 'migrating_from_svn_doc'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/workflow/README.md
2014-10-15 15:29:45 +03:00
Dmitriy Zaporozhets b8b0c3276a Merge branch 'notifications_documentation' into 'master'
Notifications documentation

Fixes #1583

See merge request !1177
2014-10-15 11:53:28 +00:00
Marin Jankovski 76cde5c0e5 Add links to the migration doc, make it clear import is only for git repos. 2014-10-15 13:13:42 +02:00
Marin Jankovski 2803d9e025 Git is a distributed vcs. 2014-10-15 13:08:55 +02:00
Marin Jankovski adb64dc2ee Clearer what to contribute. 2014-10-15 13:08:55 +02:00
Marin Jankovski fb05fa859e Add a doc on how to migrate from SVN to gitlab. 2014-10-15 13:08:55 +02:00
Marin Jankovski 57b38f6f1c Describe who can trigger builds and where, add no red tests policy to contributing doc. 2014-10-15 12:48:37 +02:00
Robert Schilling b31535494e Merge pull request #7744 from bbodenmiller/patch-14
add missing cleanup step
2014-10-15 10:22:37 +02:00
Ben Bodenmiller cec3b6c355 add missing cleanup step 2014-10-14 23:53:01 -07:00
Ben Bodenmiller 0901345d1b make sure tables are UTF8 capable
As discussed at https://github.com/gitlabhq/gitlabhq/pull/7742#issuecomment-58897445 make sure that tables have correct char set.
2014-10-14 15:45:44 -07:00
Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb
2014-10-14 18:23:51 +03:00
Marin Jankovski 8e7da6455b Fix spelling mistakes in notifications document. 2014-10-14 16:12:22 +02:00
Marin Jankovski 30b803fa3f Add notifications documentation. 2014-10-14 16:01:45 +02:00
Dmitriy Zaporozhets 4bebdc0946 Merge branch 'libravatar_documentation' into 'master'
Libravatar documentation

Fixes #1248

See merge request !1173
2014-10-14 13:27:56 +00:00
Sytse Sijbrandij 5d59890b9d Another link to GitHub flow. 2014-10-14 13:21:42 +02:00
Marin Jankovski 9abe5d36d7 Add libravatar documentation. 2014-10-14 11:23:33 +02:00
Ben Bodenmiller b0e92ca9ae minor updates to mysql cleanup
* take -> make
* correct incorrect details about when pool size was changed
2014-10-13 00:52:08 -07:00