Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-18Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov
2018-09-18Merge branch 'sh-fix-commit-email-migration' into 'master'Nick Thomas
Return a default commit email if migration has not completed Closes #51530 See merge request gitlab-org/gitlab-ce!21790
2018-09-18Merge branch 'ml-fix-initial-admin-password' into 'master'Robert Speicher
QA: Fix: set initial password even if using admin credentials See merge request gitlab-org/gitlab-ce!21785
2018-09-18Merge branch 'ml-qa-spec-use-ssh-key' into 'master'Robert Speicher
Add a new scenario to add an SSH key, perform Git actions with it, and then remove the key See merge request gitlab-org/gitlab-ce!19754
2018-09-18Merge branch 'rs-fix-2fa-codes-lint' into 'master'Douglas Barbosa Alexandre
Fix haml-lint error in 2FA codes partial Closes #51585 See merge request gitlab-org/gitlab-ce!21786
2018-09-18Fix haml-lint error in 2FA codes partialRobert Speicher
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51585
2018-09-17Fix: set initial password even if using admin credentialsMark Lapierre
2018-09-17Merge branch 'fix-url-validator' into 'master'Douglas Barbosa Alexandre
Allow UrlValidator to work with attr_encrypted See merge request gitlab-org/gitlab-ce!21776
2018-09-17Merge branch 'rails5-commonmaker' into 'master'Robert Speicher
Sync commonmaker version in Gemfile.*.lock Closes #51557 See merge request gitlab-org/gitlab-ce!21782
2018-09-17Allow UrlValidator to work with attr_encryptedNick Thomas
2018-09-17Sync commonmaker version in Gemfile.*.lockJan Provaznik
commonmaker was update in Gemfile.lock only
2018-09-17Merge branch 'rs-markdown-feature-parity' into 'master'Douglas Barbosa Alexandre
Add fixture path argument to `MarkdownFeature.new` See merge request gitlab-org/gitlab-ce!21754
2018-09-17Merge branch 'select-from-union' into 'master'Robert Speicher
Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
2018-09-17Merge branch 'osw-gitaly-diff-stats-client' into 'master'Douwe Maan
Add Gitaly diff stats RPC client See merge request gitlab-org/gitlab-ce!21732
2018-09-17Merge branch 'junit-reports-filename-patterns' into 'master'Achilleas Pipinellis
Extend JUnit XML test report documentation to explicitly mention support for filename patterns. See merge request gitlab-org/gitlab-ce!21619
2018-09-17Merge branch 'decouple-file-row-from-ide' into 'master'Filipa Lacerda
Decouple file row from IDE See merge request gitlab-org/gitlab-ce!21742
2018-09-17Merge branch 'add-2fa-button' into 'master'Annabel Dunstone Gray
Add 2fa button Closes #47963 See merge request gitlab-org/gitlab-ce!20117
2018-09-17Add 2fa buttonLuke Picciau
2018-09-17Merge branch 'update-community-contribution-guidelines' into 'master'Mek Stittri
Update Contribution guidelines via new community contribution flow See merge request gitlab-org/gitlab-ce!21761
2018-09-17Add Gitaly diff stats RPC clientOswaldo Ferreira
This adds a basic interface to fetch diff statistics given two SHAs. It's a requirement for #49399 #20282 and #19232.
2018-09-17Merge branch '51093-add-runner-json-schema-and-factory' into 'master'Kamil Trzciński
Resolve "Add runner JSON schema" Closes #51093 See merge request gitlab-org/gitlab-ce!21525
2018-09-17Merge branch 'leipert-backport-ee-changes' into 'master'Phil Hughes
Backport EE changes (missing exports) See merge request gitlab-org/gitlab-ce!21772
2018-09-17Backport EE changes to ↵Lukas Eipert
`app/assets/javascripts/filtered_search/issuable_filtered_search_token_keys.js`
2018-09-17Merge branch '50956-web-terminal' into 'master'Phil Hughes
Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
2018-09-17Merge branch '44596-double-title-merge-request-message' into 'master'Grzegorz Bizon
Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
2018-09-17Decouple file row from IDEPhil Hughes
This makes the file row component re-usable ouside of the Web IDE Pre-request for https://gitlab.com/gitlab-org/gitlab-ce/issues/14249
2018-09-17Include correct CSS file for xterm in environments pageFilipa Lacerda
When the xterm dependency was moved to a npm dependency the CSS file path was not updated correctly in the environments page. In order for xterm to render properly, it needs the correct CSS path.
2018-09-17Merge branch ↵Douwe Maan
'50944-unable-to-import-repository-undefined-method-import_file-for-nil-nilclass' into 'master' Resolve "Unable to import repository: undefined method `import_file' for nil:NilClass" Closes #50944 See merge request gitlab-org/gitlab-ce!21765
2018-09-17Resolve "Unable to import repository: undefined method `import_file' for ↵James Lopez
nil:NilClass"
2018-09-17Added FromUnion to easily select from a UNIONYorick Peterse
This commit adds the module `FromUnion`, which provides the class method `from_union`. This simplifies the process of selecting data from the result of a UNION, and reduces the likelihood of making mistakes. As a result, instead of this: union = Gitlab::SQL::Union.new([foo, bar]) Foo.from("(#{union.to_sql}) #{Foo.table_name}") We can now write this instead: Foo.from_union([foo, bar]) This commit also includes some changes to make this new setup work properly. For example, a bug in Rails 4 (https://github.com/rails/rails/issues/24193) would break the use of `from("sub-query-here").includes(:relation)` in certain cases. There was also a CI query which appeared to repeat a lot of conditions from an outer query on an inner query, which isn't necessary. Finally, we include a RuboCop cop to ensure developers use this new module, instead of using Gitlab::SQL::Union directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/51307
2018-09-17Merge branch 'fix-setup-grammar-3-ce' into 'master'Douwe Maan
Fix grammar (setup to set-up) in code comments, spec, views, etc. See merge request gitlab-org/gitlab-ce!21699
2018-09-17Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault
2018-09-17Add runner JSON schemaSteve Azzopardi
closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51093
2018-09-17Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński
Add retried jobs to pipeline stages Closes #50461 See merge request gitlab-org/gitlab-ce!21558
2018-09-17Merge branch '50460-send-deployment-information-in-job-api' into 'master'Kamil Trzciński
Resolve "Send deployment information in job API" Closes #50460 See merge request gitlab-org/gitlab-ce!21307
2018-09-17Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński
Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
2018-09-17Merge branch 'mr-widget-discussion-state-fix' into 'master'Filipa Lacerda
Fixed MR widget unresolved discussions state See merge request gitlab-org/gitlab-ce!21705
2018-09-17Merge branch 'rs-due-date-autocomplete' into 'master'Phil Hughes
Disable autocomplete for issuable due date field See merge request gitlab-org/gitlab-ce!21751
2018-09-16MR feedback: Remove now-redundant linkPatrick Lehner
2018-09-16Return a default commit email if migration has not completedStan Hu
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51530
2018-09-15Update CONTRIBUTING.mdAndreas Kämmerle
2018-09-15Update CONTRIBUTING via new community contribution flowAndreas Kämmerle
2018-09-15Merge branch 'docs/autodevops-admin' into 'master'Marcia Ramos
Document how to enable/disable Auto DevOps at the instance level Closes #49820 See merge request gitlab-org/gitlab-ce!21139
2018-09-15Add an SSH key and use it to clone and pushMark Lapierre
Adds 2 end-to-end tests: 1. Add and remove an SSH key 2. Add an SSH key and use it to clone and push Includes changes to factories to allow Git actions via SSH
2018-09-15Merge branch 'patch-29' into 'master'Stan Hu
Update command-line-commands.md to include an sample taskflow See merge request gitlab-org/gitlab-ce!21756
2018-09-15Update command-line-commands.md to include an sample taskflowAmelia Bauerly
2018-09-14Merge branch 'docs/gb/improve-docs-about-ci-config-extends' into 'master'Achilleas Pipinellis
Improve docs about CI/CD config `extends` See merge request gitlab-org/gitlab-ce!21669
2018-09-14Add fixture path argument to `MarkdownFeature.new`Robert Speicher
This default will be overridden in the EE-specific subclass that uses a different fixture path.
2018-09-14Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher
CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
2018-09-14Merge branch 'danger-commit-count' into 'master'Robert Speicher
Relax Danger requirements about changed lines Closes gitlab-org/release/framework#13 See merge request gitlab-org/gitlab-ce!21739