summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Do no rely on basename of builds, uploadsbackup-improvementsJacob Vosmaer2015-10-163-6/+15
|
* One more backup spec fixJacob Vosmaer2015-10-061-0/+1
| | | | Stop the 'uploads' part from actually running.
* Spec fixes for new backup contentsJacob Vosmaer2015-10-061-7/+7
|
* 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.
* Update CHANGELOG for 8.0.4Robert Speicher2015-10-051-2/+7
| | | | [ci skip]
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-10-0511-41/+9
|\ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'rs-remove-ci-disable'Kamil Trzcinski2015-10-0511-41/+9
| |\ | | | | | | | | | See merge request !1512
| | * Remove the option to disable CIrs-remove-ci-disableRobert Speicher2015-10-0511-41/+9
| | | | | | | | | | | | | | | | | | This option only existed to ease the CI-to-CE/EE migration process. This commit partially reverts 8b05abe816b0c681ac218096b294311dd04fde8b
* | | Merge branch 'gopeter-user-preferences-layout-option'Dmitriy Zaporozhets2015-10-059-2/+35
|\ \ \ | |/ / |/| |
| * | Merge branch 'user-preferences-layout-option' of ↵Dmitriy Zaporozhets2015-10-059-2/+35
| |\ \ |/ / / | | | | | | | | | | | | https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | improved code style and layout option namingPeter Göbel2015-10-056-7/+7
| | |
| * | added user preference to change layout widthPeter Göbel2015-10-059-2/+35
| | |
* | | Merge branch 'refactor-build-service' into 'master' Kamil Trzciński2015-10-0555-604/+570
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 create_trigger_request_service_specrefactor-build-serviceKamil Trzcinski2015-10-053-7/+8
| | | |
| * | | Fix gitlab_ci_yaml_processor specsKamil Trzcinski2015-10-051-0/+3
| | | |
| * | | Fix GitLabCiService and remove ci_yaml_file from CI push dataKamil Trzcinski2015-10-054-43/+13
| | | |
| * | | Add stage testsKamil Trzcinski2015-10-052-1/+36
| | | |
| * | | Make rubocop happyKamil Trzcinski2015-10-052-3/+3
| | | |
| * | | Fix db/schema.rbKamil Trzcinski2015-10-051-58/+36
| | | |
| * | | Fix rest of testsKamil Trzcinski2015-10-056-136/+67
| | | |
| * | | Fix build pipeliningKamil Trzcinski2015-10-053-2/+68
| | | |
| * | | Fix next bunch of testsKamil Trzcinski2015-10-054-10/+23
| | | |
| * | | Fix triggers specKamil Trzcinski2015-10-052-26/+15
| | | |
| * | | Fix next round of testsKamil Trzcinski2015-10-0520-101/+103
| | | |
| * | | Fix builds_without_retryKamil Trzcinski2015-10-053-13/+10
| | | |
| * | | Make commit_spec runKamil Trzcinski2015-10-0513-208/+226
| | | |
| * | | Add user to Ci::Build to have pusher email addressKamil Trzcinski2015-10-0513-66/+29
| | | |
| * | | Refactor commit and buildKamil Trzcinski2015-10-0532-193/+193
| | | |
* | | | Merge branch 'fix-referer-origin' into 'master' Patricio Cano2015-10-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix referals for :back and relative URL installs. `app/views/layouts/_head.html.haml` currently sets the referrer policy to "origin". This disables the use of `{ redirect_to :back }`, which is used frequently throughout GitLab, and also breaks relative URL installs for browsers that obey this policy (e.g., Chrome). For example, using the "origin" policy the "Save Changes" button on the profile screen will (a) dump you at the GitLab home screen (which I can confirm on GitLab.com) or (b) dump you out of GitLab entirely for a relative URL install (which I can confirm on my local install). The right policy is "origin-when-cross-origin", which disables HTTP_REFERER when coming from other sites but enables it internally. (https://w3c.github.io/webappsec-referrer-policy/) I can confirm that this fixes the problems with ":back" on my install. See merge request !1505
| * | | | Fix referals for :back and relative URL installs.Geoffrey Challen2015-10-031-1/+1
| | | | |
* | | | | Added CHANGELOG item about fixed user identities API.Patricio Cano2015-10-051-0/+1
| |_|_|/ |/| | |
* | | | Exclude benchmarks from the spec Rake taskYorick Peterse2015-10-051-1/+1
| | | |
* | | | Merge branch 'reply-by-email-known-issue' into 'master' Robert Speicher2015-10-051-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Document known issue with Reply by email and multiple application servers. See merge request !1499
| * | | | Add link to mail_room issue. reply-by-email-known-issueDouwe Maan2015-10-021-1/+1
| | | | | | | | | | | | | | | [ci skip]
| * | | | Document known issue with Reply by email and multiple application servers.Douwe Maan2015-10-021-1/+5
| | | | |
* | | | | Merge branch 'revert-layout-changes' into 'master' Dmitriy Zaporozhets2015-10-055-36/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'projects' into 'master'" This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e. This reverts !1487 MR because it cause bugs on mobile devices cc @skyruler See merge request !1509
| * | | | Revert "Merge branch 'projects' into 'master' "revert-layout-changesDmitriy Zaporozhets2015-10-055-36/+4
| | |_|/ | |/| | | | | | | | | | | | | | This reverts commit 2b493695a39cd4e30e92cf7830e33f2f126cb30a, reversing changes made to b5c12f742ab7431257cc685477d3be16c8cc5f0e.
* | | | Update ci to ce doc to make it clearer when you are done if you don't want ↵Marin Jankovski2015-10-051-2/+4
| | | | | | | | | | | | | | | | to keep your data.
* | | | Evaluate benchmark blocks in the proper contextYorick Peterse2015-10-051-1/+3
| | | | | | | | | | | | | | | | | | | | This ensures that blocks defines using "benchmark_subject" have access to methods defined using let/subject & friends.
* | | | Merge branch 'ci-web-hooks'Dmitriy Zaporozhets2015-10-058-69/+88
|\ \ \ \
| * | | | CI web hooks menu active state and consitent titleci-web-hooksDmitriy Zaporozhets2015-10-052-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move CI web hooks page to project settings areaDmitriy Zaporozhets2015-10-058-68/+87
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'benchmark-suite' into 'master' Yorick Peterse2015-10-058-4/+193
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Added documentation for writing benchmarksYorick Peterse2015-10-052-0/+70
| | | | |
| * | | | Allow benchmark failures for the time beingYorick Peterse2015-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This will be disallowed again once the existing benchmarks pass (which relies on #2341).
View Lorry Controller Status