summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Do no rely on basename of builds, uploadsbackup-improvementsJacob Vosmaer2015-10-163-6/+15
|
* Remove superfluous mkdir -pJacob Vosmaer2015-10-061-2/+0
|
* Remove unused variableJacob Vosmaer2015-10-061-3/+2
|
* Keep old path: db/database.sql.gzJacob Vosmaer2015-10-062-3/+4
| | | | | Documentation elsewhere refers to this internal path, let's keep it.
* Remove old "files" tarball explicitlyJacob Vosmaer2015-10-061-0/+1
|
* Reduce disk IO during SQL backupJacob Vosmaer2015-10-062-31/+26
| | | | | By using light gzip compression we can save a lot of disk IO during the backup.
* Use tar for intermediate backup storageJacob Vosmaer2015-10-064-59/+45
| | | | | | | During the backup we create an intermediate copy of two directories: builds and uploads. Instead of creating many small files with 'cp -r', we now use tar (and fast gzip) to create single intermediate files. This saves on disk IO and disk space while creating a backup.
* Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-052-10/+0
|\ | | | | | | See merge request !1512
| * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-052-10/+0
| | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-052-3/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build. All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository. All code related for creating builds is moved to CreateBuildsService. Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API. This is partially working, tests are not yet touched. This slightly changes view of Commit: ![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png) @dzaporozhets What do you think? See merge request !1502
| * Fix next round of testsKamil Trzcinski2015-10-051-1/+1
| |
| * Make commit_spec runKamil Trzcinski2015-10-051-2/+2
| |
| * Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-051-1/+1
| |
| * Refactor commit and buildKamil Trzcinski2015-10-051-0/+1
| |
* | Exclude benchmarks from the spec Rake taskYorick Peterse2015-10-051-1/+1
| |
* | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-051-1/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Basic setup for an RSpec based benchmark suitebenchmark-suiteYorick Peterse2015-10-021-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This benchmark suite uses benchmark-ips (https://github.com/evanphx/benchmark-ips) behind the scenes. Specs can be turned into benchmark specs by setting "benchmark" to "true" in the top-level describe block like so: describe SomeClass, benchmark: true do end Writing benchmarks can be done using custom RSpec matchers, for example: describe MaruTheCat, benchmark: true do describe '#jump_in_box' do it 'should run 1000 iterations per second' do maru = described_class.new expect { maru.jump_in_box }.to iterate_per_second(1000) end end end By default the "iterate_per_second" expectation requires a standard deviation under 30% (this is just an arbitrary default for now). You can change this by chaining "with_maximum_stddev" on the expectation: expect { maru.jump_in_box }.to iterate_per_second(1000) .with_maximum_stddev(10) This will change the expectation to require a maximum deviation of 10%. Alternatively you can use the it block style to write specs: describe MaruTheCat, benchmark: true do describe '#jump_in_box' do subject { -> { described_class.new } } it { is_expected.to iterate_per_second(1000) } end end Because "iterate_per_second" operates on a block, opposed to a static value, the "subject" method must return a Proc. This looks a bit goofy but I have been unable to find a nice way around this.
* | Fix rubocop warnings in libGuilherme Garnier2015-10-036-9/+5
|/
* Merge branch 'show-diff-stats-for-mr'Dmitriy Zaporozhets2015-10-012-0/+16
|\
| * Show additions/deletions stats on merge request diffDmitriy Zaporozhets2015-10-012-0/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master' Dmitriy Zaporozhets2015-10-011-1/+1
|\ \ | |/ |/| | | | | | | | | Add support of multibyte characters in LDAP UID See merge request !1472
| * Add support of multibyte characters in LDAP UIDПетров Роман2015-09-301-1/+1
| |
* | Delegate ci_project parameters to projectsKamil Trzcinski2015-09-301-19/+4
|/ | | | | | | - 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.
* 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
| | | | |