b4bedfdfb9
Merge branch 'fix-user-identities-api' into 'master'
...
Fix user identities API
Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't.
@DouweM or @stanhu could you please take a look at my code, and see if its sound?
/cc @JobV
See merge request !1398
2015-09-23 09:13:23 +00:00
03fd5919a3
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2015-09-22 23:32:35 +02:00
f60eb60473
Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't.
2015-09-22 16:26:59 -05:00
4ad9b49a14
Merge branch 'clarify-text' into 'master'
...
Clarify confirmation text on user deletion.
See #1699
Some users thought it was ok to delete the user because they'd only use the issues.
This clarifies a bit better what's being deleted when you delete a user.
See merge request !1382
2015-09-22 21:09:09 +00:00
b64d81e9bf
Merge branch 'rs-fix-migration-guide' into 'master'
...
Fix CI backup step in migration guide
[ci skip]
See merge request !1397
2015-09-22 20:27:41 +00:00
3c46ae1df3
Fix CI backup step in migration guide
...
[ci skip]
2015-09-22 16:25:23 -04:00
e500be8310
Merge branch 'exclude_initd_rake_check_when_omnibus' into 'master'
...
Skip check_initd_configured_correctly on omnibus installs
This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.
See merge request !1396
2015-09-22 20:16:51 +00:00
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
110e90c855
Skip check_initd_configured_correctly on omnibus installs
...
This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.
2015-09-22 22:56:49 +03:00
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
2cdd88e8ed
8.0.0 is released; add 8.0.1 entry to CHANGELOG
...
[ci skip]
2015-09-22 12:29:55 -04:00
e34f18a8d8
Merge pull request #9654 from Tyrael/patch-1
...
Update CHANGELOG
2015-09-22 18:12:29 +02:00
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
e2be419c95
Add to migration on what to do if you don't want your data.
2015-09-22 16:57:43 +02:00
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
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
a1b60003f0
Mention Reply by email to installation doc.
2015-09-22 15:36:40 +02:00
d2ab95d1f3
Make code block comments more verbose
2015-09-22 15:26:40 +02:00
3e926c6eb0
Emphasize when Omnibus installs are done
2015-09-22 14:54:26 +02:00
82d95c4612
Use headings to mark steps
2015-09-22 14:49:39 +02:00
f0f5be82b0
Add global numbering
2015-09-22 14:02:36 +02:00
e72ba928f9
Downtime expectations
2015-09-22 13:59:40 +02:00
917c9ea927
Migration only works 8.0 -> 8.0
2015-09-22 13:59:22 +02:00
29bb3b5215
More explanation about moving DB secrets
2015-09-22 13:52:53 +02:00
23fa5d7d9e
Fix typo
2015-09-22 13:44:43 +02:00
1afaf5f7fb
Fix ordering of paragraphs and code blocks
2015-09-22 13:42:47 +02:00
c3805c1830
More text outside code blocks
2015-09-22 13:40:44 +02:00
67b38c8d71
Update/improve CI migration docs for 8.0.1
2015-09-22 13:35:22 +02:00
f8fb5f1466
Update CHANGELOG
...
8.0.0 has been released
2015-09-22 13:22:18 +02:00
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
531c208e62
update documentation on web hooks by suggestion [ci skip]
2015-09-22 09:12:06 +00:00
8be6c74ac3
documentation on ssl verification in web hooks
2015-09-22 11:00:11 +02:00
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
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
156ace4778
Add missing rake and change nginx config for CI migration
2015-09-22 09:45:52 +02:00
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
524381dcf0
Add note about automatically re-enabling CI during migrate task
...
[ci skip]
2015-09-21 21:19:09 -04:00
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
da54661bbc
Remove unintended linebreak
2015-09-21 21:10:50 -04:00
541d08b8f6
Be consistent about "only required for manual install" notes
2015-09-21 21:10:16 -04:00
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
7fa0c793d2
Whitespace
2015-09-21 18:02:50 -04:00
0346e9724a
Tweak remaining CSS for Markdown preview
...
Missed a few items in !1378
2015-09-21 14:08:26 -07:00
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
12969a14dd
Add commands for Omnibus installation
2015-09-21 22:47:33 +02:00
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
157ee6623c
Update guide
2015-09-21 22:36:33 +02:00
3a4c5986fb
clarify confirmation text on user deletion.
2015-09-21 22:05:13 +02:00
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
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
Douwe Maan
Robert Schilling
Patricio Cano
Robert Speicher
Robert Speicher
Sytse Sijbrandij
Achilleas Pipinellis
Robert Schilling
Job van der Voort
Marin Jankovski
Marin Jankovski
Jacob Vosmaer
Ferenc Kovacs
Job van der Voort
Dmitriy Zaporozhets
Kamil Trzcinski
Stan Hu
Hannes Rosenögger
