Commit Graph

2412 Commits

Author SHA1 Message Date
Robert Speicher 471671f80d Merge branch 'reply-by-email-known-issue' into 'master'
Document known issue with Reply by email and multiple application servers.

See merge request !1499
2015-10-05 15:54:04 +00:00
Marin Jankovski 144eef3850 Update ci to ce doc to make it clearer when you are done if you don't want to keep your data. 2015-10-05 16:39:58 +02:00
Yorick Peterse b6808f437d Merge branch 'benchmark-suite' into 'master'
Basic RSpec/benchmark-ips powered benchmark suite

Corresponding issue: #2909, see the commit messages for more details.

A few things to note:

1. The current use of `subject` isn't exactly easy on the eyes due to them having to return a Proc, I'm not sure yet how (and if) we can work around this.
2. The maximum amount of iterations in the current `User.by_login` benchmark is arbitrary, we might have to adjust it once said method's performance has been improved.
3. Benchmarks currently take 2 seconds to warm up and 5 seconds to run (benchmark-ips defaults). 
4. The custom RSpec matcher file (`benchmark_matchers.rb`) is a bit messy, any feedback on this would be appreciated

Any comments/feedback on this would be greatly appreciated.

See merge request !1503
2015-10-05 12:56:52 +00:00
Achilleas Pipinellis 66fa6070e8 Merge branch 'golang-i386' into 'master'
Golang download instructions assume amd64



See merge request !1488
2015-10-05 12:00:07 +00:00
Yorick Peterse 0bef64911b Added documentation for writing benchmarks 2015-10-05 11:32:22 +02:00
Douwe Maan 4a157e50a2 Add link to mail_room issue.
[ci skip]
2015-10-02 14:40:40 +00:00
Kamil Trzcinski a4292066f0 Back and forth permission on builds/ 2015-10-02 12:44:20 +02:00
Douwe Maan f012e07c4f Document known issue with Reply by email and multiple application servers. 2015-10-02 08:46:39 +00:00
Robert Speicher d7eceafb27 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-10-01 17:13:59 -04:00
Drew Blessing b72cf6f2a2 Merge branch 'etc-default-gitlab' into 'master'
Fix path to /etc/default/gitlab in 8.0 update guide



See merge request !1437
2015-10-01 19:00:57 +00:00
Patricio Cano b48072d4fc Merge branch 'upgrade-version' into 'master'
Link to rake tasks

I believe there should be a link to rake tasks from backup restore, to give the user more options. That is why I added the link in the documentation. 

Because of tweet https://twitter.com/gordonjb/status/641252693701476352

See merge request !1928
2015-10-01 16:32:15 +00:00
Patricio Cano 3e9772843c Merge branch 'create-issue' into 'master'
New doc about how to create an issue in GitLab Basics



See merge request !1925
2015-10-01 16:29:29 +00:00
Jacob Vosmaer 2fa8820671 Golang download instructions assume amd64 2015-10-01 15:05:13 +02:00
Kamil Trzcinski bb6a39892d Update migration documentation 2015-10-01 11:34:29 +02:00
karen Carias 126dd008e1 solved conflict 2015-09-30 13:33:51 -07:00
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 6055c507cc Fix path to /etc/default/gitlab in 8.0 update guide 2015-09-25 15:40:44 +02: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