summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gitaly-auth-v2' into 'master'Robert Speicher2018-09-211-8/+22
|\ | | | | | | | | Use the new gitaly auth scheme (v2) See merge request gitlab-org/gitlab-ce!21417
| * Use the new gitaly auth scheme (v2)Alejandro Rodríguez2018-09-201-8/+22
| |
* | Correct Gitlab Capitalization in code filesMarcel Amirault2018-09-216-10/+10
|/
* Add Gitlab::Database::Subquery.self_join to delete_all with limitToon Claes2018-09-201-0/+16
| | | | | | | | | | `delete_all` doesn't support limit, so you'd need to subquery that. And instead of subquerying with `where(id: query)`, it's better to use an `INNER JOIN`. This method also works with MySQL, while subquerying doesn't (without another layer of subquerying) Reference: https://stackoverflow.com/questions/17892762/mysql-this-version-of-mysql-doesnt-yet-support-limit-in-all-any-some-subqu/17892886#17892886
* Merge branch 'fix-rubocop-todo' into 'master'Douglas Barbosa Alexandre2018-09-191-1/+1
|\ | | | | | | | | Fix rubocop Style/ZeroLengthPredicate See merge request gitlab-org/gitlab-ce!21793
| * Fix rubocop Style/ZeroLengthPredicateSemyon Pupkov2018-09-181-1/+1
| |
* | Include post migrations when loading the schemaYorick Peterse2018-09-192-0/+18
|\ \ | | | | | | See merge request gitlab-org/gitlab-ce!21689
| * | Ensure the schema is loaded with post_migrations includedDJ Mountney2018-09-112-0/+18
| | | | | | | | | | | | | | | | | | If doing a schema load, the post_migrations should also be marked as up, even if SKIP_POST_DEPLOYMENT_MIGRATIONS was set, otherwise future migration runs will be broken.
* | | Use standalone diff stats RPC on every comparison viewOswaldo Ferreira2018-09-195-7/+46
| | |
* | | Merge branch '51571-wrapper-rake-task-uploads-migrate-os' into 'master'Douwe Maan2018-09-191-1/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add wrapper rake task to migrate all uploads to OS Closes #51571 See merge request gitlab-org/gitlab-ce!21779
| * | | Add wrapper rake task to migrate all uploads to OSBalasankar "Balu" C2018-09-181-1/+25
| | | | | | | | | | | | | | | | | | | | Add a rake task that will trigger gitlab:uploads:migrate rake task with different possible arguments, one by one.
* | | | Merge branch 'remove-ee-specific-lines-from-plan-concerns' into 'master'Robert Speicher2018-09-182-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove EE-specific lines from Plan concerns See merge request gitlab-org/gitlab-ce!21448
| * | | | Remove EE-specific code from ProtectedRefAccessSean McGivern2018-09-172-3/+3
| |/ / /
* | | | Merge branch '51564-fix-commit-email-usage' into 'master'Douwe Maan2018-09-181-4/+0
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
| * | | Remove Gitlab::Git::Repository#user_to_committerNick Thomas2018-09-171-4/+0
| |/ /
* | | Merge branch 'select-from-union' into 'master'Robert Speicher2018-09-176-18/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Replace direct use of Gitlab::SQL::Union with a "from_union" method Closes #51307 See merge request gitlab-org/gitlab-ce!21672
| * | | Added FromUnion to easily select from a UNIONYorick Peterse2018-09-176-18/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge branch 'osw-gitaly-diff-stats-client' into 'master'Douwe Maan2018-09-173-0/+38
|\ \ \ | |/ / |/| | | | | | | | Add Gitaly diff stats RPC client See merge request gitlab-org/gitlab-ce!21732
| * | Add Gitaly diff stats RPC clientOswaldo Ferreira2018-09-173-0/+38
| | | | | | | | | | | | | | | This adds a basic interface to fetch diff statistics given two SHAs. It's a requirement for #49399 #20282 and #19232.
* | | Fix grammar (setup to set-up) in code comments, spec, views, etc.Marcel Amirault2018-09-173-3/+3
| | |
* | | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-173-2/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
| * | | Always create `gitlab` service account and service account token regardless ↵Thong Kuah2018-09-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of ABAC/RBAC This also solves the async nature of the automatic creation of default service tokens for service accounts. It also makes explicit which service account token we always use. create cluster role binding only if the provider has legacy_abac disabled.
| * | | Teach GitLab how to create Secret of type ServiceAccountTokenThong Kuah2018-09-142-0/+37
| | | | | | | | | | | | | | | | Add create_secret to KubeClient
| * | | Teach GoogleApi::CloudPlatform::Client#projects_zones_clusters_create about ↵Thong Kuah2018-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | legacy_abac argument Fix spec warning: removing `initialize' may cause serious problems Actually verify that `service.create_cluster` is called with expected request_body and other args
* | | | Merge branch '50824-fix-prepend-concern' into 'master'Robert Speicher2018-09-142-4/+73
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE: Properly implement prepending for Concern See merge request gitlab-org/gitlab-ce!21444
| * | | | Following the feedbacksLin Jen-Shin2018-09-111-3/+3
| | | | |
| * | | | Explain why we need PrependableLin Jen-Shin2018-09-111-0/+8
| | | | |
| * | | | Preserve prepend semantics for RubyLin Jen-Shin2018-09-111-31/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However we still want to make ClassMethods work! And we'll need to fix codes using the wrong include/prepend along the way. There were a lot of misuses.
| * | | | Fix Override. Properly define prependedLin Jen-Shin2018-09-111-2/+6
| | | | | | | | | | | | | | | | | | | | We should never be sloppy!
| * | | | Properly implement prepending for ConcernLin Jen-Shin2018-09-111-0/+71
| | | | |
* | | | | Merge branch 'sh-fix-multipart-upload-signed-urls' into 'master'Nick Thomas2018-09-141-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix object storage uploads not working with AWS v2 Closes gitlab-workhorse#181 See merge request gitlab-org/gitlab-ce!21731
| * | | | | Fix object storage uploads not working with AWS v2Stan Hu2018-09-141-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we were passing query strings as symbols, the fog-aws storage driver was omitting the uploadId and partNumber query strings from the signature in multipart uploads. This fix makes AWS and Ceph work with v2 signatures. See: https://github.com/fog/fog-aws/blob/v3.0.0/lib/fog/aws/storage.rb#L733 Closes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/181
* | | | | Resolve "Add functionality to change what email address online actions ↵Nick Thomas2018-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | commit using"
* | | | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-11/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
| * | | | replace cond. assignment by default param valueAlexis Reigel2018-09-121-5/+3
| | | | |
| * | | | dry up available scopes to constantsAlexis Reigel2018-08-201-3/+3
| | | | |
| * | | | add Ci::Runner.offline scope to APIAlexis Reigel2018-08-201-10/+7
| | | | |
* | | | | Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-13126-0/+531
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * | | | | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-11126-0/+531
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | | | | Merge branch ↵Grzegorz Bizon2018-09-136-3/+195
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42861-move-include-external-files-in-gitlab-ci-yml-from-starter-to-libre' into 'master' Resolve "Move "include external files in .gitlab-ci.yml" from Starter to Libre" Closes #42861 See merge request gitlab-org/gitlab-ce!21603
| * | | | | Stack rescue blocks for Gitlab::Ci::Config#initializeMatija Čupić2018-09-111-10/+8
| | | | | |
| * | | | | Add missing frozen string literal commentsMatija Čupić2018-09-115-0/+10
| | | | | |
| * | | | | Reconcile differences in lib/gitlab/ciMatija Čupić2018-09-082-11/+17
| | | | | |
| * | | | | Reconcile differences in lib/gitlab/ci/externalMatija Čupić2018-09-082-8/+6
| | | | | |
| * | | | | Reconcile differences in lib/gitlab/ci/external/fileMatija Čupić2018-09-083-21/+45
| | | | | |
| * | | | | Stub http request on specs intead of mocking HTTPartyMatija Čupić2018-09-071-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | CE mirror of bb2a9fde8e6a4d1df13638fe336f641b9c72ef59
| * | | | | Address MR suggestionsMatija Čupić2018-09-075-33/+34
| | | | | | | | | | | | | | | | | | | | | | | | CE mirror of c4578b951e331fe8c75cd4f948ce74cec6587bad
| * | | | | Improve external architectureMatija Čupić2018-09-079-125/+155
| | | | | | | | | | | | | | | | | | | | | | | | CE mirror of 4f17c7b2c30188302e6a73421acbf5a09fb2c823
| * | | | | Make Repository#blob_data_at publicMatija Čupić2018-09-071-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | CE mirror of 17de13ada1a98da060802c55889489a512183cd1
| * | | | | Address MR commentsMatija Čupić2018-09-074-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | CE mirror of 1269dc47b7f8d1a9913de326c9bd356d3e603663
View Lorry Controller Status