summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Depened on exact version of SimpleCov when patchedsimple-covGrzegorz Bizon2016-07-272-2/+2
|
* Deploy test coverage report on master pipeline onlyGrzegorz Bizon2016-07-221-0/+2
|
* Improve CI configuration file for pages stageGrzegorz Bizon2016-07-221-6/+6
|
* Deploy ruby test coverage report to gitlab pagesGrzegorz Bizon2016-07-211-14/+29
|
* Revert eager loading in test env that breakes teaspoonGrzegorz Bizon2016-07-211-1/+1
|
* Introduce SimpleCovEnv singleton helper and use itGrzegorz Bizon2016-07-214-37/+51
|
* Patch SimpleCov to reuse code for coverage mergerGrzegorz Bizon2016-07-211-53/+21
|
* Improve simplecov config to avoid missing filesGrzegorz Bizon2016-07-211-1/+9
|
* Load app in test env eagerly to improve test coverageGrzegorz Bizon2016-07-211-1/+1
|
* Remove unused coverallsKamil Trzcinski2016-07-212-4/+4
|
* Use simplecov 0.12.0 which fixes merging test resultsKamil Trzcinski2016-07-212-33/+2
|
* Fix spinach testsKamil Trzcinski2016-07-211-1/+1
|
* Fix SimpleCov report mergingKamil Trzcinski2016-07-212-2/+38
|
* Update configuration of SimpleCovKamil Trzcinski2016-07-215-16/+26
|
* Store all simplecov configuration in one fileKamil Trzcinski2016-07-214-22/+24
|
* Fix update-coverage jobKamil Trzcinski2016-07-211-1/+4
|
* Add simplecov to spinach testsKamil Trzcinski2016-07-211-0/+8
|
* Remove unused simplecov-rcovKamil Trzcinski2016-07-211-1/+0
|
* Use `scripts/merge-simplecov`Kamil Trzcinski2016-07-213-64/+66
|
* Merge coverage reportKamil Trzcinski2016-07-214-5/+83
|
* Merge branch 'registry-manifest' into 'master' Achilleas Pipinellis2016-07-211-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document when Docker Registry manifest v1 support was added ## What does this MR do? Document when Docker Registery manifest v1 support was added ## Are there points in the code the reviewer needs to double check? Is this the best way to document this? We never documented support for v2 or which docker versions we support overall. ## Why was this MR needed? We made a change and it wasn't documented. Also, it's good to document which docker versions we support. ## What are the relevant issue numbers? !4669 ## Screenshots (if relevant) See merge request !5378
| * Document when Docker Registery manifest v1 support was addedregistry-manifestMark Pundsack2016-07-201-1/+2
| |
* | Merge branch 'artifact-name' into 'master' Achilleas Pipinellis2016-07-211-2/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify artifacts:name default value ## What does this MR do? Add the default artifact name (`artifacts`) to documentation. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? We didn't document the default artifact name. ## What are the relevant issue numbers? ## Screenshots (if relevant) See merge request !5377
| * | Clarify artifacts:name default valueartifact-nameMark Pundsack2016-07-201-2/+3
| |/
* | Merge branch 'rs-revert-csp' into 'master' Robert Speicher2016-07-213-106/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Content Security Policy The secure-only cookies setting was causing an issue where the session was constantly being lost in the development environment. Revert "Merge branch 'csp-basics' into 'master'" This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2. --- Revert "Merge branch 'remove-csp-sentry-reporting' into 'master'" This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a. See merge request !5381
| * | Revert "Merge branch 'csp-basics' into 'master' "Robert Speicher2016-07-203-116/+0
| | | | | | | | | | | | | | | This reverts commit 9065f9c5ff073d376eb6377ca63ead93623fc8a3, reversing changes made to f0b446e55506b251e85afd4bb063586bccb52eb2.
| * | Revert "Merge branch 'remove-csp-sentry-reporting' into 'master' "Robert Speicher2016-07-201-2/+12
|/ / | | | | | | | | This reverts commit 79b02e40e5842540ceff4454f6c2c51f13fc081c, reversing changes made to f2cd21e8946dcef13e8be408b96b079b5ced682a.
* | Merge branch 'remove-flaky-diff-note-tests' into 'master' Douwe Maan2016-07-211-94/+0
|\ \ | |/ |/| | | | | | | | | Remove flaky diff note tests for now These will be replaced with better, more exhaustive specs by @lbennett based on the conversation in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5262. See merge request !5379
| * Remove flaky diff note tests for nowremove-flaky-diff-note-testsDouwe Maan2016-07-201-94/+0
| |
* | Merge branch 'sidebar-clipboard-toggle' into 'master' Fatih Acet2016-07-203-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent toggling sidebar when clipboard icon clicked. Prevents sidebar being toggle when copy to clipboard icon clicked. Fixes #19399 ![sidebar-toggle](/uploads/e4e8dfe9ff2546464269242b5f3e34b1/sidebar-toggle.gif) See merge request !5326
| * | Prevent toggling sidebar when clipboard icon clicked.sidebar-clipboard-toggleFatih Acet2016-07-203-1/+5
| | |
* | | Merge branch '18586-user-authorized_projects-is-slow' into 'master' Yorick Peterse2016-07-206-0/+152
|\ \ \ | | | | | | | | | | | | | | | | Refactor user authorization check for a single project to avoid querying all user projects See merge request !5102
| * | | Refactor user authorization check for a single project to avoid querying all ↵Alejandro Rodríguez2016-07-206-0/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user projects Currently, even when searching for all authorized issues of *one* project, we run the `Users#authorized_projects` query (which can be rather slow). This update checks if we are handling issues of just one project and does the authorization check locally. It does have the downside of basically repeating the logic of `Users#authorized_projects` on `Project#authorized_for_user`.
* | | | Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-2019-76/+318
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to block sign ups using a domain blacklist. As part of this MR, I restructured the Application Settings form to separate **Sign up** related settings from **Sign in** related settings and make everything cleaner and easier to read. Fixes #19749 Related to #5573 See merge request !5259
| * | | Reorder allowed params for `ApplicationSetting` and add more details to docs.email-domain-blacklistPatricio Cano2016-07-192-3/+9
| | | |
| * | | Removed escaping characters by using double quotes.Patricio Cano2016-07-181-1/+1
| | | |
| * | | Default to manual input for `domain_whitelist`, syntax fixes and added new ↵Patricio Cano2016-07-186-10/+19
| | | | | | | | | | | | | | | | tests.
| * | | Refactor `match_domain` to a predicate: `domain_matches?`Patricio Cano2016-07-181-3/+3
| | | |
| * | | Refactor and rename `restricted_signup_domains` to `domain_whitelist` to ↵Patricio Cano2016-07-1813-55/+58
| | | | | | | | | | | | | | | | better conform to its behavior and newly introduced behavior.
| * | | Move inline JS to admin.js.coffee specific file.Patricio Cano2016-07-181-0/+12
| | | |
| * | | Refactored the domain separator regex, plus syntax and grammar fixes.Patricio Cano2016-07-184-20/+19
| | | |
| * | | Make sure email domain validation method is private.Patricio Cano2016-07-181-28/+26
| | | |
| * | | Fixed `signup_domain_valid?` flow and added documentation.Patricio Cano2016-07-183-20/+39
| | | |
| * | | Added CHANGELOG item.Patricio Cano2016-07-181-0/+1
| | | |
| * | | Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-1810-33/+228
| | | |
* | | | Merge branch 'faster-builds-ci' into 'master' Douwe Maan2016-07-201-7/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed improvement for builds without DB Only fetch the images which we are going to use. Speeds up the builds by about 30-45 seconds. /cc @ayufan See merge request !4994
| * | | | Use YAML inheritance to DRY the .gitlab-ci.ymlfaster-builds-ciZ.J. van de Weg2016-07-201-19/+14
| | | | |
| * | | | Speed improvement for builds without DBZ.J. van de Weg2016-06-291-8/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the builds which do not use the DB or Redis won't pull the images from docker, and won't migrate the DB. This _should_ improve the build times slightly but also create a cleaner trace.
* | | | | Merge branch 'cs-warn-on-failure' into 'master' Fatih Acet2016-07-209-10/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn on failure ## What does this MR do? Adds styling and HTML for a `success_with_warnings` status in the MR widget. Unfinished as it needs some plumbing in the relevant CI controllers and models. ## Are there points in the code the reviewer needs to double check? Not at the moment, though I think I'll probably need help getting this to work in the backend. ## What are the relevant issue numbers? #17669 ## Screenshots (if relevant) ![Screen_Shot_2016-06-29_at_12.02.49_PM](/uploads/af4a915689633fe028f44bb34ae7a5b1/Screen_Shot_2016-06-29_at_12.02.49_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) cc: @ayufan See merge request !5004
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into cs-warn-on-failurecs-warn-on-failureKamil Trzcinski2016-07-2033-105/+283
| |\ \ \ \ \