summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Add GetCommitSignatures feature flagadd-commit-signatures-feature-flagFelipe Artur2019-06-281-1/+6
| | | | | | | Adds feature flag for GetCommitSignatures which got ported to go. More info: https://gitlab.com/gitlab-org/gitaly/merge_requests/1283
* Fix broken worktree testGitalyBot2019-06-251-5/+0
| | | | | The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
* Merge branch 'sh-quiet-backup-secrets-log' into 'master'Rémy Coutable2019-06-251-2/+2
|\ | | | | | | | | | | | | Silence backup warnings when CRON=1 in use Closes #63703 See merge request gitlab-org/gitlab-ce!30033
| * Silence backup warnings when CRON=1 in useStan Hu2019-06-251-2/+2
| | | | | | | | | | | | | | If CRON=1 is in use, we shouldn't generate any output or admins may be notified via e-mail about unnecessary warnings. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/63703
* | Merge branch 'pages-ssl-project-aware-feature-flag' into 'master'Nick Thomas2019-06-252-9/+17
|\ \ | | | | | | | | | | | | Use project depended feature flag for pages ssl and get certificates only for enabled domains See merge request gitlab-org/gitlab-ce!29609
| * | Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flagVladimir Shushlin2019-06-252-9/+17
| | | | | | | | | | | | | | | Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* | | Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-252-15/+17
|/ / | | | | | | | | | | | | This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-252-5/+8
| | | | | | | | Changes migration and all other places the attribute is used
* | Limit time tracking values to hoursJon Kolb2019-06-252-1/+4
| | | | | | | | | | Adds an instance setting to limit display of time tracking values to hours only
* | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-241-1/+1
|\ \ | | | | | | | | | | | | Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
| * | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-241-1/+1
| | | | | | | | | | | | | | | We will introduce #cluster at a later stage. Also deprecate this method
* | | Change HTTP Status Code when repository disabledSam Battalio2019-06-243-2/+12
| |/ |/|
* | Merge branch 'sh-optimize-todos-controller' into 'master'Douglas Barbosa Alexandre2019-06-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
| * | Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-241-1/+1
| | | | | | | | | | | | | | | Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
* | | Revert "Merge branch..."Kamil Trzciński2019-06-241-3/+1
|/ / | | | | | | This reverts merge request !29832
* | Merge branch 'search-blob-basenames' into 'master'Kamil Trzciński2019-06-241-3/+6
|\ \ | | | | | | | | | | | | Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
| * | Build correct basenames for title search resultssearch-blob-basenamesMarkus Koller2019-06-201-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* | | Add name & search parameters to project environments APILee Tickett2019-06-241-1/+6
| | |
* | | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-242-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
| * | | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-242-2/+2
| | | | | | | | | | | | | | | | | | | | Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
| * | | Fix label serialisation in issue and note hooksSean McGivern2019-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | We were not calling hook_attrs on the labels correctly. Specs were passing because the issues under test did not have any labels!
* | | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-242-19/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
| * | | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-202-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* | | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-241-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Enable JIT Kubernetes resource creation for project level clusters See merge request gitlab-org/gitlab-ce!29515
| * | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this behaviour was only available to group and instance-level clusters, as some project clusters relied on Kubernetes credentials being passed through to the runner instead of having their resources managed by GitLab (which is not available when using JIT). These clusters have been migrated to unmanaged, so resources can be created on demand for the remaining managed clusters.
* | | | | Select deployments that only has the app labelThong Kuah2019-06-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | As Auto DevOps deployments both label and annotations, that will be included in the deploy board so need to warn at all.
* | | | | Include the GitLab version in the cache key for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-06-211-2/+2
| | | | |
* | | | | Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre2019-06-211-1/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Avoid storing backtraces from Bitbucket Cloud imports in the database See merge request gitlab-org/gitlab-ce!29862
| * | | | | Avoid storing backtraces from Bitbucket Cloud imports in the databasesh-clean-up-bitbucket-import-errorsStan Hu2019-06-191-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We noticed in https://gitlab.com/gitlab-com/gl-infra/production/issues/908 some Bitbucket imports took over a second to load their projects row because `import_error` was huge due to errors. To prevent this, we now: 1. Clean the backtraces 2. Log the details into importer.log 3. Omit the details from the database
* | | | | | Merge branch ↵Stan Hu2019-06-211-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' into 'master' Fix copying a single line from Firefox Closes #63406 See merge request gitlab-org/gitlab-ce!29832
| * \ \ \ \ \ Merge branch 'master' into ↵63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-alsoAdam Hegyi2019-06-196-6/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also' # Conflicts: # spec/lib/gitlab/ci/ansi2html_spec.rb
| * | | | | | | Fix copying a single line from FirefoxAdam Hegyi2019-06-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that all open <span> tags are closed before adding a <br> tag.
* | | | | | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds enum certificate_source to pages_domains table with default manually_uploaded Mark certificates as 'gitlab_provided' if the were obtained through Let's Encrypt Mark certificates as 'user_provided' if they were uploaded through controller or api Only show private key in domain edit form if it is 'user_provided' Only show LetsEncrypt option if is enabled by application settings (and feature flag) Refactor and fix some specs to match new logic Don't show Let's Encrypt certificates as well
* | | | | | | | Sanitize LDAP output in Rake tasksDrew Blessing2019-06-211-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The various LDAP check Rake tasks have long supported a SANITIZE environment variable. When present, identifiable information is obscured such as user names and project/group names. Until now, the LDAP check did not honor this. Now it will only say how many users were found. This should at least give the indication that the LDAP configuration found something, but will not leak what it is. Resolves #56131
* | | | | | | | Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'Kamil Trzciński2019-06-213-3/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled complex ci variable expression statements by default See merge request gitlab-org/gitlab-ce!29904
| * | | | | | | | Enabled complex ci variable expression statements by defaultdefault-enable-complex-ci-variables-expressionsdrew cimino2019-06-203-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern2019-06-211-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not rewrite relative links for system notes Closes #63162 See merge request gitlab-org/gitlab-ce!29825
| * | | | | | | | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-201-0/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-gitaly-usage-data' into 'master'Stan Hu2019-06-202-3/+18
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly data to the usage ping See merge request gitlab-org/gitlab-ce!29893
| * | | | | | | | | Add Gitaly data to the usage pingZeger-Jan van de Weg2019-06-202-3/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly data wasn't available to the team, an this change is a first iteration towards understanding what data we need and how to interpret it. Later more values will be added. For now the most important thing is the filesystem String Array, as that includes data on ext4 exposure and NFS. Part of: https://gitlab.com/gitlab-org/gitlab-ce/issues/60602
* | | | | | | | | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-201-6/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes made by EE to various YAML configuration files See merge request gitlab-org/gitlab-ce!29606
| * | | | | | | | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-201-6/+10
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make this happen, we need to conditionally add the group_saml strategy when running tests, but only on EE. This requires some changes to Gitlab.ee? so that it can be used before/without loading the Rails environment. We also have to change how we require a few files, so this can run outside of Rails.
* | | | | | | | Add embedding flag and filter to CPU/MemSarah Yasonik2019-06-203-10/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commits adds support for metrics dashboards for embedding. If the flag 'embedded' is provided to the environments/id/metrics_dashboard endpoint, the response will be suitable for embedding in issues or other content. This is a precursor for support for embedding metrics in GFM.
* | | | | | | | Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into ↵Ash McKenzie2019-06-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Gitlab::JsonCache#parse_value ensure string Closes #63510 See merge request gitlab-org/gitlab-ce!29885
| * | | | | | | Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncacheAsh McKenzie2019-06-201-1/+1
| | | | | | | |
* | | | | | | | Render GFM html in GraphQLBob Van Landuyt2019-06-202-0/+48
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `markdown_field` to our types. Using this helper will render a model's markdown field using the existing `MarkupHelper` with the context of the GraphQL query available to the helper. Having the context available to the helper is needed for redacting links to resources that the current user is not allowed to see. Because rendering the HTML can cause queries, the complexity of a these fields is raised by 5 above the default. The markdown field helper can be used as follows: ``` markdown_field :note_html, null: false ``` This would generate a field that will render the markdown field `note` of the model. This could be overridden by adding the `method:` argument. Passing a symbol for the method name: ``` markdown_field :body_html, null: false, method: :note ``` It will have this description by default: > The GitLab Flavored Markdown rendering of `note` This could be overridden by passing a `description:` argument. The type of a `markdown_field` is always `GraphQL::STRING_TYPE`.
* | | | | | | Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master'Stan Hu2019-06-201-6/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix(favicon): get favicon_path, so it works also with uploads object store See merge request gitlab-org/gitlab-ce!29482
| * | | | | | | fix(favicon): get favicon_path, so it works also with uploads object storeRoger Meier2019-06-141-6/+2
| | | | | | | |
* | | | | | | | Updating CE repo to include new EE users API changesMichael Leopard2019-06-191-14/+1
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Updated users API documentation Moved API level changes to the service level
* | | | | | | CE backport for changes in EE MR 14017Luke Duncalfe2019-06-191-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports to CE changes to allow the EE model DesignManagement::Repository to override the #attributes_at method to provide its own git attributes. The #attributes_at method was freely available, as it's never called by anything in the app. It looks like the code that called it got refactored out of existence in ca66a04f. It was still being called in a spec https://gitlab.com/gitlab-org/gitlab-ce/blob/85b29c1c2fa3b94d7371cf454c485457a0756cb1/spec/services/files/create_service_spec.rb#L40 which I've left because with the change in Lfs::FileTransformer in fact is now again the perfect test! See EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14017 And these comment threads https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178002089 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/13894#note_178049984