Commit Graph
2755 Commits
Author SHA1 Message Date
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 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 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
Stan Hu 4957415e00 Merge pull request #9650 from szechyjs/fb-close-comment
FogBugz Import: Include closed comments since they may contain user data
2015-09-25 16:46:50 -07: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
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00
Ben Boeckel 22db4398c6 api: expose note_events and enable_ssl_verification for hooks 2015-09-24 12:33:11 -04:00
Douwe Maan a58c6e9a95 Merge branch 'cleanup-ci-dashboard' into 'master'
Cleanup ci dashboard

Part of #2594. Based on !1403

* remove rendering GitLab projects with not enabled CI on CI dashboard
* remove enabling CI for projects from CI dashboard (now its done by simply pushing `.gitlab-ci.yml`)
* simplify the projects query for CI dashboard 

See merge request !1405
2015-09-24 07:32:29 +00:00
Douwe Maan 73a3df4de3 Fix LDAP attribute mapping 2015-09-23 16:37:59 +02:00
Dmitriy Zaporozhets 31b15e3dce Simplify CI projects query
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 15:30:24 +02:00
Douwe Maan 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
Patricio Cano 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
Achilleas Pipinellis 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
Kamil Trzcinski 156ace4778 Add missing rake and change nginx config for CI migration 2015-09-22 09:45:52 +02: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 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
Jared Szechy 4e2bb80fb3 FogBugz Import: Closed comments may contain user data 2015-09-21 10:49:44 -04:00
Jacob Vosmaer e0823d189f Relax CI version check during import 2015-09-21 11:46:12 +02:00
Jacob Vosmaer 25c7467ce1 Make importing builds less noisy 2015-09-21 11:42:59 +02:00
Douwe Maan 0c83349867 Merge branch 'master' into rename-reply-by-email 2015-09-21 10:35:56 +02:00
Douwe Maan ee028d9d60 Rename reply_by_email to incoming_email to prepare for the future. 2015-09-21 10:35:37 +02:00
Kamil Trzcinski ee0f1c00b1 Use GitlabCi::VERSION when checking migration 2015-09-21 10:33:35 +02:00
Marin Jankovski d2c90d7494 Merge branch 'optimize-ci-tags-migration' into 'master'
CI migration rake task for GitLab CE

- Uses backup format for final GitLab CI 8.0
- Highly optimized tags migration SQL queries


See merge request !1365
2015-09-21 08:26:06 +00:00
Kamil Trzcinski a37e591e74 Use INSERT INTO to insert tags 2015-09-21 10:07:53 +02:00
Robert Speicher 2b94f5fb06 Allow RelativeLinkFilter to go up multiple directories 2015-09-20 19:21:33 -04:00
Kamil Trzcinski 098c198271 Disable CI for time of migration 2015-09-21 00:14:07 +02:00
Kamil Trzcinski 500e277a83 Change notices during migrating 2015-09-21 00:13:58 +02:00
Kamil Trzcinski 265ad515c6 Create CI migration task on GitLab side 2015-09-20 23:20:51 +02:00
Kamil Trzcinski 45a105b127 Use pure SQL queries to migrate CI tags 2015-09-20 22:13:47 +02:00
Douwe Maan 3377808193 Fix reply by email for comments on a specific line in a diff/commit. 2015-09-20 18:18:39 +02:00
Robert Speicher 619f04c196 Allow relative links to go up one directory level 2015-09-18 14:03:42 -04:00
Valery SizovandKamil Trzcinski a0c1a12dee remove API calls from CE to CI 2015-09-18 18:02:11 +02:00
Dmitriy Zaporozhets ac571623d8 Merge branch 'pg_dump_schema' into 'master'
Add pg_schema to backup config

https://dev.gitlab.org/gitlab/gitlabhq/issues/2489

See merge request !1345
2015-09-18 14:33:35 +00:00
Valery Sizov d7242054ba add pg_schema to backup config 2015-09-18 16:29:13 +03:00
Kamil Trzcinski 97fa990406 Use 400 to notify that CI API is disabled 2015-09-18 12:46:47 +02:00
Kamil Trzcinski e41a29b0c3 Allow to disable GitLab CI 2015-09-18 12:46:47 +02:00
Valery Sizov b7e49d8042 Fix: ci projects order 2015-09-17 20:12:17 +03:00
Dmitriy Zaporozhets da3d35952d Merge branch 'restrict-user-api-integers' into 'master'
Restrict users API endpoints to use integer IDs

Closes #2267

See merge request !1156
2015-09-17 07:29:57 +00:00
Kamil Trzciński cac969229a Merge branch 'fix-nginx' into 'master'
Add missing proxy requests to migration docs

See merge request !1317
2015-09-16 20:02:49 +00:00
Kamil Trzcinski 50e5950947 Add missing proxy requests to migration docs 2015-09-16 20:45:58 +02:00
Robert Speicher 09bcce7d1f Merge branch 'ldap-attributes' into 'master'
Allow configuration of LDAP attributes GitLab will use for the new user account.

Fixes #2412.

See merge request !1261
2015-09-16 18:34:55 +00:00
Kamil Trzcinski e01300ddb0 Fix update_runner_info helper 2015-09-16 16:46:26 +02:00
Kamil Trzcinski 7348d34cfd Fix migrate tags statement 2015-09-16 16:46:19 +02:00
Kamil Trzcinski ac8d2eb065 Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-16 13:34:58 +02:00
Kamil Trzcinski 0859ba75a8 Fix migrate task 2015-09-16 13:30:34 +02:00
Kamil Trzcinski d3886f9d41 Added migration docs and updated installation documentation 2015-09-16 10:58:33 +02:00
Douwe Maan 84d57bc703 Make code clearer 2015-09-16 09:14:04 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API
Closes #2266
2015-09-15 22:55:22 -07:00
Kamil Trzcinski df7d807d5a Migrate CI services 2015-09-16 00:43:04 +02:00
Kamil Trzcinski 9c5833d5ac Add rake task for easy migration of SQL dumps 2015-09-16 00:09:09 +02:00