Kamil Trzcinski
c199811f47
Update documentation and update-permissions script
2015-09-22 23:28:42 +02:00
Kamil Trzcinski
6d9730e07d
Update docker image
2015-09-22 23:16:04 +02:00
Kamil Trzcinski
0a61f0b4e2
PIN users to UIDs and monkey patch initctl
2015-09-22 22:42:03 +02:00
Sytse Sijbrandij
37ecae33ec
Add better deprecation notice for the upgrader. Too easy to miss otherwise https://twitter.com/0x663030623472/status/646262552796594176
2015-09-22 19:56:51 +00:00
Robert Speicher
9e1392553b
Merge branch 'rs-changelog' into 'master'
...
8.0.0 is released; add 8.0.1 entry to CHANGELOG
[ci skip]
See merge request !1394
2015-09-22 16:32:20 +00:00
Robert Speicher
2cdd88e8ed
8.0.0 is released; add 8.0.1 entry to CHANGELOG
...
[ci skip]
2015-09-22 12:29:55 -04:00
Job van der Voort
70875a6aba
Merge branch 'dont_want_the_data' into 'master'
...
Add to migration on what to do if you don't want your data.
If you don't want to migrate your CI data , remove the old builds directory.
See merge request !1392
2015-09-22 15:04:08 +00:00
Marin Jankovski
e2be419c95
Add to migration on what to do if you don't want your data.
2015-09-22 16:57:43 +02:00
Job van der Voort
555c197643
Merge branch 'install-doc-reply-by-email' into 'master'
...
Mention Reply by email in installation doc.
Added the "Enable Reply by email" section and moved the others around.
See merge request !1390
2015-09-22 14:28:50 +00:00
Marin Jankovski
398092273b
Merge branch 'ci-migration-doc-improvements' into 'master'
...
Ci migration doc improvements
Use export improvements in CI 8.0.1, make upgrades a more prominent part of the process, do not shut down GitLab during CI data import.
See merge request !1387
2015-09-22 14:10:24 +00:00
Douwe Maan
a1b60003f0
Mention Reply by email to installation doc.
2015-09-22 15:36:40 +02:00
Jacob Vosmaer
d2ab95d1f3
Make code block comments more verbose
2015-09-22 15:26:40 +02:00
Jacob Vosmaer
3e926c6eb0
Emphasize when Omnibus installs are done
2015-09-22 14:54:26 +02:00
Jacob Vosmaer
82d95c4612
Use headings to mark steps
2015-09-22 14:49:39 +02:00
Jacob Vosmaer
f0f5be82b0
Add global numbering
2015-09-22 14:02:36 +02:00
Jacob Vosmaer
e72ba928f9
Downtime expectations
2015-09-22 13:59:40 +02:00
Jacob Vosmaer
917c9ea927
Migration only works 8.0 -> 8.0
2015-09-22 13:59:22 +02:00
Jacob Vosmaer
29bb3b5215
More explanation about moving DB secrets
2015-09-22 13:52:53 +02:00
Jacob Vosmaer
23fa5d7d9e
Fix typo
2015-09-22 13:44:43 +02:00
Jacob Vosmaer
1afaf5f7fb
Fix ordering of paragraphs and code blocks
2015-09-22 13:42:47 +02:00
Jacob Vosmaer
c3805c1830
More text outside code blocks
2015-09-22 13:40:44 +02:00
Jacob Vosmaer
67b38c8d71
Update/improve CI migration docs for 8.0.1
2015-09-22 13:35:22 +02:00
Job van der Voort
0ce5fb71b6
Merge branch 'webhooks' into 'master'
...
documentation on ssl verification in web hooks
See merge request !1386
2015-09-22 09:13:52 +00:00
Job van der Voort
531c208e62
update documentation on web hooks by suggestion [ci skip]
2015-09-22 09:12:06 +00:00
Job van der Voort
8be6c74ac3
documentation on ssl verification in web hooks
2015-09-22 11:00:11 +02:00
Dmitriy Zaporozhets
8ae026a6e6
Merge branch 'fix-ci-permissions' into 'master'
...
Fix CI permissions

This fixes two problems:
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
See merge request !1379
2015-09-22 07:54:11 +00:00
Marin Jankovski
548b7ce804
Merge branch 'fix-ci-migration-docs' into 'master'
...
Add missing rake and change nginx config for CI migration
/cc @marin
See merge request !1385
2015-09-22 07:51:36 +00:00
Kamil Trzcinski
156ace4778
Add missing rake and change nginx config for CI migration
2015-09-22 09:45:52 +02:00
Robert Speicher
eb5fd3f86b
Merge branch 'rs-ci-migration-guide' into 'master'
...
Reformat and copy edit the CI-to-CE migration guide
[ci skip]
See merge request !1335
2015-09-22 02:11:35 +00:00
Robert Speicher
524381dcf0
Add note about automatically re-enabling CI during migrate task
...
[ci skip]
2015-09-21 21:19:09 -04:00
Robert Speicher
34e43c1a62
Merge branch 'tweak-more-css-for-md-preview' into 'master'
...
Tweak remaining CSS for Markdown preview
See merge request !1383
2015-09-22 01:15:09 +00:00
Robert Speicher
da54661bbc
Remove unintended linebreak
2015-09-21 21:10:50 -04:00
Robert Speicher
541d08b8f6
Be consistent about "only required for manual install" notes
2015-09-21 21:10:16 -04:00
Robert Speicher
96fd255597
More migration guide updates
...
- Rename "Finishing Up" to "Nginx configuration"
- Add fourth "Finishing Up" section
- Add Troubleshooting section with a link to backup restoration docs
- Change a few indented blocks into fenced blocks so they're highlighted
properly.
- Added Marin's suggestions for CI-to-CE-on-different-server section.
2015-09-21 18:51:01 -04:00
Robert Speicher
7fa0c793d2
Whitespace
2015-09-21 18:02:50 -04:00
Stan Hu
0346e9724a
Tweak remaining CSS for Markdown preview
...
Missed a few items in !1378
2015-09-21 14:08:26 -07:00
Robert Speicher
c1399cbc66
Merge branch 'rs-fix-spec-warnings' into 'master'
...
Ensure raise_error expectations provide arguments
See merge request !1381
2015-09-21 20:54:14 +00:00
Kamil Trzcinski
12969a14dd
Add commands for Omnibus installation
2015-09-21 22:47:33 +02:00
Robert Speicher
ba71542a5a
Merge branch 'fix-issue-2593' into 'master'
...
Fix Error 500 when comparing non-existing branches
Closes #2593
See merge request !1355
2015-09-21 20:46:15 +00:00
Kamil Trzcinski
157ee6623c
Update guide
2015-09-21 22:36:33 +02:00
Stan Hu
ac289687a9
Merge branch 'fix-dangling-milestone-ids' into 'master'
...
Remove deleted milestones from merge requests
This is related to !1348 but thought it would be useful as a separate MR. This MR removes deleted milestone IDs from any merge request.
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
See merge request !1350
2015-09-21 19:43:23 +00:00
Robert Speicher
d4acda1253
Merge branch 'rs-relative-link-up-one' into 'master'
...
Allow relative links to go up one directory level
See merge request !1352
2015-09-21 19:38:37 +00:00
Robert Speicher
2f88459297
Ensure raise_error expectations provide arguments
2015-09-21 15:35:29 -04:00
Stan Hu
24a0e86dd3
Remove deleted milestones from merge requests
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-21 12:05:01 -07:00
Robert Speicher
d4a960161e
Merge branch 'rename-reply-by-email' into 'master'
...
Rename reply_by_email to incoming_email to prepare for the future.
Closes #2579 .
See merge request !1367
2015-09-21 18:52:13 +00:00
Kamil Trzciński
534e548d44
Merge branch 'ci-import-improvements' into 'master'
...
CI import improvements
See merge request !1369
2015-09-21 18:33:42 +00:00
Dmitriy Zaporozhets
cbdee053b4
Merge branch 'fix-ci-handling' into 'master'
...
Fixed MR handling when GitLab CI project is not present
This is copy of !1371
/cc @jacobvosmaer @vsizov @dzaporozhets
See merge request !1373
2015-09-21 18:29:29 +00:00
Kamil Trzcinski
071ae2619c
Update CHANGELOG
2015-09-21 20:28:56 +02:00
Kamil Trzcinski
68cdeb71d5
Fix permissions problems
...
- Allow developers to retry builds
- Hide advanced project options from CI page for non-admin users
2015-09-21 20:28:56 +02:00
Robert Speicher
cacc70daf4
Merge branch 'fix-note-edit-preview-css' into 'master'
...
More tweaks to make note edit/preview CSS consistent
Closes #2585
See merge request !1378
2015-09-21 18:18:55 +00:00