summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into 'master' Jacob Vosmaer2015-09-291-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add support for AWS S3 Server-Side Encryption supportPaul Beattie2015-09-251-3/+4
| | | | | | | | | | | | | | 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.
* | Merge branch 'orphaned-repo-cleanup' into 'master' Douwe Maan2015-09-291-34/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Guard against trailing slashes in repos_pathJacob Vosmaer2015-09-151-1/+5
| | |
| * | Improve repo cleanup taskJacob Vosmaer2015-09-151-34/+11
| | | | | | | | | | | | | | | Clean up more than just global (legacy) repos. Also, instead of deleting, just rename.
* | | Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
|\ \ \ | |_|/ |/| | FogBugz Import: Include closed comments since they may contain user data
| * | FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
| | |
* | | api: add enable_ssl_verification to PUT/POST hooksBen Boeckel2015-09-241-2/+4
| | |
* | | api: expose note_events and enable_ssl_verification for hooksBen Boeckel2015-09-241-1/+1
| | |
* | | Merge branch 'cleanup-ci-dashboard' into 'master' Douwe Maan2015-09-241-21/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Simplify CI projects queryDmitriy Zaporozhets2015-09-231-21/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix LDAP attribute mappingfix-ldap-attributesDouwe Maan2015-09-231-1/+2
|/ / /
* | | Merge branch 'fix-user-identities-api' into 'master' Douwe Maan2015-09-231-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-apiPatricio Cano2015-09-221-0/+11
| |/ / | | | | | | | | | documentation said it was possible, but actually wasn't.
* | | Skip check_initd_configured_correctly on omnibus installsAchilleas Pipinellis2015-09-221-0/+5
| | | | | | | | | | | | | | | This was causing the task `gitlab-rake gitlab:incoming_email:check` to fail.
* | | Add missing rake and change nginx config for CI migrationKamil Trzcinski2015-09-221-12/+0
| | |
* | | Merge branch 'rs-relative-link-up-one' into 'master' Robert Speicher2015-09-211-11/+29
|\ \ \ | | | | | | | | | | | | | | | | Allow relative links to go up one directory level See merge request !1352
| * | | Allow RelativeLinkFilter to go up multiple directoriesrs-relative-link-up-oneRobert Speicher2015-09-201-2/+1
| | | |
| * | | Allow relative links to go up one directory levelRobert Speicher2015-09-181-11/+30
| | | |
* | | | Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-213-23/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
| * \ \ \ Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-215-71/+189
| |\ \ \ \
| * | | | | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-213-24/+19
| | | | | |
* | | | | | Relax CI version check during importci-import-improvementsJacob Vosmaer2015-09-211-1/+3
| | | | | |
* | | | | | Make importing builds less noisyJacob Vosmaer2015-09-211-1/+1
| |_|_|/ / |/| | | |
* | | | | Use GitlabCi::VERSION when checking migrationKamil Trzcinski2015-09-211-4/+2
| |/ / / |/| | |
* | | | Merge branch 'optimize-ci-tags-migration' into 'master' Marin Jankovski2015-09-215-71/+189
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Use INSERT INTO to insert tagsKamil Trzcinski2015-09-211-7/+8
| | | | |
| * | | | Disable CI for time of migrationKamil Trzcinski2015-09-211-0/+13
| | | | |
| * | | | Change notices during migratingKamil Trzcinski2015-09-211-2/+2
| | | | |
| * | | | Create CI migration task on GitLab sideKamil Trzcinski2015-09-204-40/+152
| | | | |
| * | | | Use pure SQL queries to migrate CI tagsKamil Trzcinski2015-09-201-33/+25
| |/ / /
* | | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-201-1/+2
|/ / /
* | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-182-38/+0
|/ /
* | Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets2015-09-181-2/+6
|\ \ | | | | | | | | | | | | | | | | | | Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
| * | add pg_schema to backup configpg_dump_schemaValery Sizov2015-09-181-2/+6
| | |
* | | Use 400 to notify that CI API is disabledallow-to-disable-ciKamil Trzcinski2015-09-181-1/+3
| | |
* | | Allow to disable GitLab CIKamil Trzcinski2015-09-182-0/+8
|/ /
* | Fix: ci projects orderci_projects_orderValery Sizov2015-09-171-0/+21
| |
* | Merge branch 'restrict-user-api-integers' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Restrict users API endpoints to use integer IDs Closes #2267 See merge request !1156
| * | Restrict users API endpoints to use integer IDsStan Hu2015-08-231-1/+1
| | | | | | | | | | | | Closes #2267
* | | Merge branch 'fix-nginx' into 'master'Kamil Trzciński2015-09-161-0/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | Add missing proxy requests to migration docs See merge request !1317
| * | | Add missing proxy requests to migration docsfix-nginxKamil Trzcinski2015-09-161-0/+12
| | | |
* | | | Merge branch 'ldap-attributes' into 'master'Robert Speicher2015-09-164-11/+54
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
| * | | Make code clearerldap-attributesDouwe Maan2015-09-161-11/+9
| | | |
| * | | Shuffle config around a bitDouwe Maan2015-09-093-15/+9
| | | |
| * | | Add attributes to LDAP::Config.Douwe Maan2015-09-082-3/+8
| | | |
| * | | Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan2015-09-083-11/+57
| | | |
* | | | Fix update_runner_info helperKamil Trzcinski2015-09-161-0/+2
| | | |
* | | | Fix migrate tags statementKamil Trzcinski2015-09-161-1/+1
| | | |
* | | | Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
View Lorry Controller Status