summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | | |
| * | | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | | |
| * | | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | | |
| * | | | | | | Apply suggestion to doc/topics/autodevops/index.mdnathanbietz2019-07-091-1/+1
| | | | | | | |
| * | | | | | | Update index.md.... change "helm deploy" to "helm upgrade"nathanbietz2019-07-041-1/+1
| | | | | | | |
| * | | | | | | Update index.md.... add instructions on how to add a `values.yaml` override ↵nathanbietz2019-07-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file to the default auto-deploy-app helm chart by setting `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml` (or `-f my-values.yaml`).
* | | | | | | | Merge branch 'fix-unicorn-sampler-workers-count' into 'master'Stan Hu2019-07-093-11/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make unicorn_workers to return meaningful results Closes #63659 See merge request gitlab-org/gitlab-ce!30506
| * | | | | | | | Make unicorn_workers to return meaningful resultsfix-unicorn-sampler-workers-countKamil Trzciński2019-07-093-11/+38
| | | | | | | | |
* | | | | | | | | Merge branch 'project_api' into 'master'Douglas Barbosa Alexandre2019-07-0911-35/+304
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve Project API Closes #49938, #40892, and #35992 See merge request gitlab-org/gitlab-ce!28327
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sathieu/gitlab-ce-project_apiDouglas Barbosa Alexandre2019-07-09834-7310/+11484
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Reduce changes to doc/api/projects.mdproject_apiNick Thomas2019-07-041-62/+69
| | | | | | | | | | |
| * | | | | | | | | | Update json for "Get single project" docMathieu Parent2019-07-031-69/+62
| | | | | | | | | | |
| * | | | | | | | | | Fix API performance problem of auto_devops queryMathieu Parent2019-07-031-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Add changelog entryMathieu Parent2019-07-031-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Add auto_devops_* to project APIMathieu Parent2019-07-036-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The auto_devops object sometimes doesn't exists. We may need to create it.
| * | | | | | | | | | Add auto_cancel_pending_pipelines to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Add build_coverage_regex to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Add build_timeout to project APIMathieu Parent2019-07-033-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Add build_git_strategy attribute to project APIMathieu Parent2019-07-037-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We map the boolean to the string 'fetch' or 'clone', to be more explicit.
| * | | | | | | | | | Add *_access_level to project APIMathieu Parent2019-07-037-35/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - issues_access_level - repository_access_level - merge_requests_access_level - builds_access_level - wiki_access_level - snippets_access_level
* | | | | | | | | | | Merge branch 'nfriend-add-delay-support-to-tooltip-js' into 'master'Fatih Acet2019-07-091-0/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add delay customization to `app/assets/javascripts/vue_shared/directives/tooltip.js` See merge request gitlab-org/gitlab-ce!30524
| * | | | | | | | | | | Add delay customization to tooltip.jsnfriend-add-delay-support-to-tooltip-jsNathan Friend2019-07-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR allows the delay of tooltips instantiated using tooltip.js to be customized through localStorage.
* | | | | | | | | | | | Merge branch 'jc-disable-can-use-disk-temp' into 'master'Stan Hu2019-07-092-11/+14
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling can_use_disk? temporarily See merge request gitlab-org/gitlab-ce!30526
| * | | | | | | | | | | | Disabling can_use_disk? temporarilyJohn Cai2019-07-092-11/+14
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'osw-bypass-push-rules-for-merge-to-ref' into 'master'Stan Hu2019-07-095-17/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE port] Bypass push rules for merge to ref service See merge request gitlab-org/gitlab-ce!30426
| * | | | | | | | | | | [CE port] Bypass push rules for merge to ref serviceosw-bypass-push-rules-for-merge-to-refOswaldo Ferreira2019-07-095-17/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out push rules to validate commit message does not apply in the context of automatic merge to the refs/merge-requests/:iid/merge. Mainly because if it fails to merge to it, we currently can't give enough preemptive feedback to the user and it'll turn the merge request unmergeable (given we automatically mark it as unmergeable if we can't merge to the ref). In general, it's a systematic operation, which already bypasses user authorization and git hooks. Therefore, this commit makes it bypass the push rules at EE as well.
* | | | | | | | | | | | Merge branch '63945-update-mixin-deep-to-1.3.2' into 'master'Mike Greiling2019-07-092-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mixin-deep to 1.3.2 Closes #63945 See merge request gitlab-org/gitlab-ce!30223
| * | | | | | | | | | | | Update mixin-deep to 1.3.2Takuya Noguchi2019-07-012-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To address a Prototype Pollution vulnerability, which exists in `mixin-deep` package, versions `>=2.0.0 <2.0.1 || <1.3.2` (CVE-2019-10746). - Diff: https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2 - Synk ID: https://app.snyk.io/vuln/SNYK-JS-MIXINDEEP-450212 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | | | | | | | | Merge branch 'ce-10609-system-notes-scoped-labels' into 'master'Kamil Trzciński2019-07-092-7/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of "Create system notes for scoped labels" See merge request gitlab-org/gitlab-ce!30250
| * | | | | | | | | | | | | Update label note to support scoped labels notesce-10609-system-notes-scoped-labelsJarka Košanová2019-07-022-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - port of EE change
* | | | | | | | | | | | | | Merge branch 'update-net-ssh' into 'master'Robert Speicher2019-07-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update net-ssh gem to ~> 5.2 See merge request gitlab-org/gitlab-ce!30341
| * | | | | | | | | | | | | | Update net-ssh gem to ~> 5.2Pirate Praveen2019-07-042-3/+3
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jramsay/enable-object-dedupe-by-default' into 'master'Nick Thomas2019-07-093-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable repository object pools by default Closes gitaly#1606 See merge request gitlab-org/gitlab-ce!29595
| * | | | | | | | | | | | | | Enable repository object pools by defaultJames Ramsay2019-07-093-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object pools allow Git objects to be shared from the parent project to forks, reducing storage requirements.
* | | | | | | | | | | | | | | Merge branch 'sh-redact-redis-perf-bar' into 'master'Sean McGivern2019-07-092-2/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Perform more redactions in Redis performance bar traces Closes #64309 See merge request gitlab-org/gitlab-ce!30514
| * | | | | | | | | | | | | | | Perform more redactions in Redis performance bar tracesStan Hu2019-07-092-2/+42
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HMSET and AUTH commands were not properly redacted. This commit does that and adds a test. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64309
* | | | | | | | | | | | | | | Merge branch 'negative-commit-message-push-rule-docs' into 'master'Ray Paik2019-07-092-24/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Negative commit message push rule docs See merge request gitlab-org/gitlab-ce!30521
| * | | | | | | | | | | | | | | Add the changelog entry.Maikel2019-07-091-0/+5
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Document the negative commit message push rule for the API.Maikel2019-07-091-24/+27
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch ↵Achilleas Pipinellis2019-07-091-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/63603-update-project-import-export-docs-to-include-what-exactly-is-imported-exported' into 'master' Resolve "Update project import/export docs to include what exactly is imported/exported" Closes #63603 See merge request gitlab-org/gitlab-ce!29987
| * | | | | | | | | | | | | | | | Resolve "Update project import/export docs to include what exactly is ↵Michael Leopard2019-07-091-0/+7
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imported/exported"
* | | | | | | | | | | | | | | | Merge branch 'rs-basic-config-files' into 'master'Lin Jen-Shin2019-07-0910-2/+163
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE-EE parity for config/initializers See merge request gitlab-org/gitlab-ce!30484
| * | | | | | | | | | | | | | | | Add frozen_string_literal to EE files now in CErs-basic-config-filesRobert Speicher2019-07-085-0/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move lib/gitlab dependency to applicationRobert Speicher2019-07-082-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use the `Gitlab.ee` and `.ee?` methods in several initializers now.
| * | | | | | | | | | | | | | | | CE-EE parity for files in config/initializersRobert Speicher2019-07-084-2/+31
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add EE-only initializersRobert Speicher2019-07-085-0/+123
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are only used by EE, and are now wrapped in `Gitlab.ee` blocks for file parity.
* | | | | | | | | | | | | | | | Merge branch '63583-update-npm-documentation-with-new-naming-conventions' ↵Achilleas Pipinellis2019-07-091-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Update NPM documentation with new naming conventions." Closes #63583 See merge request gitlab-org/gitlab-ce!29935
| * | | | | | | | | | | | | | | | NPM Registry docs new package naming conventionSteve Abrams2019-07-091-7/+8
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation is updated to include details on the new limitations and rules to naming NPM packages. A note is included on how naming collisions are handled.
* | | | | | | | | | | | | | | | Merge branch 'qa-ml-parallel-tests' into 'master'Lin Jen-Shin2019-07-0914-32/+172
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run E2E tests in parallel via parallel_tests See merge request gitlab-org/gitlab-ce!29654
| * | | | | | | | | | | | | | | Run tests in parallel via parallel_testsMark Lapierre2019-07-0914-32/+172
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the parallel_tests gem to execute tests in multiple processes simultaneously on the same machine. Adds the `--parallel` CLI option that instructs the QA framework to use the parallel_tests executable. Tests need access to global state contained in `Runtime::Scenario` so when `--parallel` is invoked `Runtime::Scenario` is serialized to an environment variable, which is passed to parallel_tests, and then deserialized in `spec_helper`.
View Lorry Controller Status