Commit Graph

2392 Commits

Author SHA1 Message Date
Robert Speicher 2b9b20bc96 Merge branch 'apache-gghs-tcp' into 'master'
Apache needs gitlab-git-http-server on TCP

[ci skip]

See merge request !1462
2015-09-30 16:17:37 +00:00
Robert Speicher ecdee8772b Merge branch 'golang-ruby-versions' into 'master'
Bump Ruby and Golang versions

[ci skip]

See merge request !1467
2015-09-30 16:15:48 +00:00
Dmitriy Zaporozhets 048dd5e458 Merge branch 'merge-ci-data' into 'master'
Use data stored in projects instead of ci_projects

- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.

/cc @dzaporozhets 

See merge request !1404
2015-09-30 16:05:33 +00:00
Dimitar Dimitrov f4eaae5767 Add a missing RAILS_ENV=production to crontab clearing
All other commands in the guide set this env var, but it's missing here
and this causes whenever not to clear the crontab file of gitab_ci
properly.
2015-09-30 16:30:13 +03:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48:40 +02:00
Jacob Vosmaer 60b3055c0c Use Ruby 2.1.7 for new installs from source 2015-09-29 17:24:22 +02:00
Jacob Vosmaer 70460f7989 Use Golang 1.5.1 for new installs from source 2015-09-29 17:20:14 +02:00
Jacob Vosmaer 3591afeef0 Apache needs gitlab-git-http-server on TCP 2015-09-29 13:37:07 +02:00
Jacob Vosmaer 958af6f5c2 Merge branch 'master' into 'master'
Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280
2015-09-29 10:31:42 +00:00
Douwe Maan e1b7fcedfb Merge branch 'doc-omniauth-ldap-limitations' into 'master'
Documentation of omniauth-ldap limitations

Further documentation about limitations directly impacting settings of
users' LDAP servers.

Closes #2613

See merge request !1421
2015-09-29 07:47:42 +00:00
Douwe Maan 084e35527c Merge branch 'orphaned-repo-cleanup' into 'master'
Improve repo cleanup task

I accidentally wrote a new script, not seeing we already had one.
But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script.

See merge request !1298
2015-09-29 07:35:59 +00:00
Sytse Sijbrandij 096bb561fc Merge branch 'linktoee' into 'master'
note about EE git hooks

Because of https://gitlab.com/gitlab-com/www-gitlab-com/issues/415#note_2131220

See merge request !1934
2015-09-29 05:40:03 +00:00
karen Carias 44b8844122 changed words 2015-09-28 19:04:32 -07:00
Cyriac Thomas 05f29a5cb3 Simplified sentence as per @stanhu's note 2015-09-26 19:37:55 +00:00
Cyriac Thomas 922c635b67 Fixed grammar on Using Docker Build doc. 2015-09-26 18:15:58 +00:00
Robert Speicher 3453b79c9d Correct an inaccuracy in the Markdown doc
[ci skip]
2015-09-25 15:44:06 -04:00
Paul Beattie 253d2320ab Add support for AWS S3 Server-Side Encryption support
This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console. This is optional and not
required to make S3 uploads work.
2015-09-25 17:06:31 +01:00
Jacob Vosmaer 255d5f7501 Improve 'rake gitlab:cleanup:repos' documentation 2015-09-25 14:38:42 +02:00
Jacob Vosmaer 1c9deece3d Make sure Unicorn listens on localhost:8080 2015-09-25 10:59:36 +02:00
Stan Hu d5e73ae634 Merge branch 'hook-api-updates' into 'master'
Hook api updates



See merge request !1429
2015-09-24 23:28:59 +00:00
Robert Schilling 83c9752e04 Merge pull request #9664 from fantasywind/patch-1
Update 7.14-to-8.0.md
2015-09-24 20:55:55 +02:00
Robert Speicher 1fef314df2 Merge branch 'update-mailroom' into 'master'
Update mailroom to 0.5.2

Fixes #2698 and #2711.

See merge request !1424
2015-09-24 18:09:31 +00:00
Robert Speicher 3656c2fa53 Merge branch 'rs-troubleshooting' into 'master'
Add Troubleshooting section to 8.0 docs

[ci skip]

See merge request !1416
2015-09-24 17:03:12 +00:00
Robert Speicher 58c21dd77b Update Troubleshooting sections 2015-09-24 12:55:00 -04:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel b07f48d52e doc: list note_events as a valid parameter for PUT/POST hooks 2015-09-24 12:33:58 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Jacob Vosmaer 040718e106 Refer to Apache templates in 8.0 update guide 2015-09-24 17:47:48 +02:00
Douwe Maan 477017722b Add and document option to use StartTLS with mail_room. 2015-09-24 15:15:25 +02:00
Julio bd6c982bf1 Documentation of omniauth-ldap limitations
Further documentation about limitations directly impacting settings of
users' LDAP servers.
2015-09-24 12:03:23 +00:00
Robert Speicher 6e65108325 Add Troubleshooting section to 7.14 to 8.0 Update guide 2015-09-23 20:36:25 -04:00
Robert Speicher e8ce9639da Add Troubleshooting section to Install guide 2015-09-23 20:36:17 -04:00
karen Carias cfcb5f0f6a fixed step to instructions 2015-09-23 13:43:57 -07:00
karen Carias 84d450bf4d fixed step to instructions 2015-09-23 13:33:58 -07:00
Chia Yu Pai b57bc0389e Update 7.14-to-8.0.md
Add missing path change back
2015-09-24 00:35:22 +08:00
Douwe Maan ff63a166e9 Merge branch 'rs-fix-help-links' into 'master'
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
2015-09-23 11:44:17 +00:00
Hannes Rosenögger 486a647925 Merge branch 'correct-markdown-documentation' into 'master'
Correct markdown.md docs RE use in commit messages.

This is an improvement to the situation covered in issue #1582. It corrects the markdown documentation to demonstrate that GFM cannot currently be used in commit messages.

See merge request !1343
2015-09-23 10:35:48 +00:00
Robert Speicher c551c81e28 Fix "User permissions" help page path 2015-09-22 18:26:41 -04:00
Robert Speicher 3c46ae1df3 Fix CI backup step in migration guide
[ci skip]
2015-09-22 16:25:23 -04: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
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