summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-171-0/+13
| | | | | | | | | | | | | | | | | This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
* Extract process_name from GitLab::SentryAndrew Newdigate2019-01-161-1/+1
| | | | | | | | GitLab::Sentry has a program_context method to determine whether a Sentry exception occurred in Sidekiq or rails. Since we will need similar functionality for distributed tracing, this change extracts the program_context method into GitLab.process_name for more general consumption.
* Merge branch 'remove-cancel-all-button-in-job-list-view' into 'master'Grzegorz Bizon2019-01-151-2/+0
|\ | | | | | | | | | | | | Remove cancel all jobs button in general jobs list view Closes #34665 See merge request gitlab-org/gitlab-ce!24010
| * Delete extra empty line in project.rbJordi Llull Chavarría2019-01-071-1/+0
| |
| * Remove cancel all action in Jobs ControllerJordi Llull2019-01-071-1/+0
| |
* | Generate searchable JSDoc documentationWinnie Hellmann2019-01-141-0/+14
| |
* | Merge branch 'knative-show-page' into 'master'Mike Greiling2019-01-111-0/+1
|\ \ | | | | | | | | | | | | Initial Serverless Functions detailed view See merge request gitlab-org/gitlab-ce!23863
| * | Initial Serverless Functions detailed viewChris Baumbauer2019-01-101-0/+1
| | |
* | | Service for calling Sentry issues apiReuben Pereira2019-01-091-0/+2
| | |
* | | Add SSE-C key configuration option for Amazon S3 remote backupsPepijn Van Eeckhoudt2019-01-092-0/+5
|/ /
* | Import CSV BackendHeinrich Lee Yu2019-01-071-0/+1
| | | | | | | | Process CSV uploads async using a worker then email results
* | Add Import CSV FrontendHeinrich Lee Yu2019-01-071-0/+1
|/ | | | Added button and modal to accept CSV file for uploading
* Move settings operations controller from EE to CEmove-settings-oprations-to-cePeter Leitzen2019-01-061-0/+4
| | | | | This commit prepares the structure for the upcoming feature error tracking.
* Merge branch 'kamil-refactor-ci-builds-v5' into 'master'Grzegorz Bizon2019-01-061-0/+31
|\ | | | | | | | | Use BuildMetadata to store build configuration in JSONB form See merge request gitlab-org/gitlab-ce!21499
| * Add config_options|variables to BuildMetadatakamil-refactor-ci-builds-v5Kamil Trzciński2019-01-041-0/+31
| | | | | | | | | | | | | | | | | | | | | | These are data columns that store runtime configuration of build needed to execute it on runner and within pipeline. The definition of this data is that once used, and when no longer needed (due to retry capability) they can be freely removed. They use `jsonb` on PostgreSQL, and `text` on MySQL (due to lacking support for json datatype on old enough version).
* | Merge branch 'deprecated-callback-false' into 'master'Robert Speicher2019-01-041-3/+0
|\ \ | |/ |/| | | | | Fix deprecation: returning false in Active Record and Active Model callbacks See merge request gitlab-org/gitlab-ce!24134
| * Fix deprecation: returning false in Active Record and Active Model callbacks ↵Jasper Maes2019-01-031-3/+0
| | | | | | | | will not implicitly halt a callback chain
* | Add support for explicit index orderAndreas Brandl2019-01-031-3/+9
|/ | | | | | | | ActiveRecord supports `:order` natively, but it is skipped because of our specific patch to support opclasses. Relevant AR code: https://github.com/rails/rails/blob/5-0-stable/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb#L1167
* Support both 0 and NULL lock_versionsDouwe Maan2018-12-271-6/+2
|
* Make it clear that monkey patch is no longer needed in Rails 5.1Douwe Maan2018-12-272-3/+6
|
* Merge branch 'sh-use-system-path-for-appearance-logos' into 'master'Douwe Maan2018-12-271-1/+2
|\ | | | | | | | | | | | | Use system paths for appearance logos Closes gitlab-ee#6778 See merge request gitlab-org/gitlab-ce!24024
| * Use system paths for appearance logosStan Hu2018-12-251-1/+2
| | | | | | | | | | | | | | | | | | When object storage is enabled, the logos used to customize a GitLab appearance causes the time-limited URLs to be used. We fix this by forcing all of these URLs to use the /uploads/-/system prefix so that they will always be proxied through GitLab. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/6778
* | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-241-42/+0
|/ | | | | Full list of changes: https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
* Merge branch 'support-gitaly-tls' into 'master'Lin Jen-Shin2018-12-211-1/+1
|\ | | | | | | | | Support tls communication in gitaly See merge request gitlab-org/gitlab-ce!22602
| * Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-1719-342/+105
| |\
| * \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-1121-52/+132
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-11-1517-74/+112
| |\ \ \
| * | | | Add documentation for tls gitalyAhmad Hassan2018-11-021-1/+1
| | | | |
| * | | | Add more specsAhmad Hassan2018-10-311-1/+0
| | | | |
| * | | | Support tls communication in gitalyAhmad Hassan2018-10-301-0/+1
| | | | |
* | | | | Always load the metrics the lastLin Jen-Shin2018-12-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Because this could potentially load a model and we shouldn't load models before all the patches we have in places.
* | | | | Load the devise initializer before metricsBob Van Landuyt2018-12-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metrics tries to initialize the `EventsFinder` to instrumnt it. The `EventsFinder` tries to load the `Event` model, which in turn loads the `User` model. Loading the `User` model requires Devise to be initialized. So to avoid problems around this, we load devise before loading metrics.
* | | | | Move Projects::ReleasesController under TagsAlessio Caiazza2018-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Rename Projects::ReleasesController to Projects::Tags::ReleasesController
* | | | | Adds releases index routeFilipa Lacerda2018-12-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renders empty index page Adds Releases entry to the navigation bar behind a feature flag Renders 404 when feature flag for releases is not enabled
* | | | | Merge branch 'sh-carrierwave-patch-google-acl' into 'master'Sean McGivern2018-12-181-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix object storage not working properly with Google S3 compatibility Closes #53846 See merge request gitlab-org/gitlab-ce!23858
| * | | | | Fix object storage not working properly with Google S3 compatibilityStan Hu2018-12-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in AWS S3 compatibility mode, Google now appears to reject requests that includes this header with this error: ``` Requests cannot specify both x-amz and x-goog headers ``` This has been submitted upstream via https://github.com/carrierwaveuploader/carrierwave/pull/2356. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53846.
* | | | | | Add NGINX 0.16.0 and above metricsJoshua Lambert2018-12-171-1/+47
| | | | | |
* | | | | | Bump gitlab-reliable-fetcher gemValery Sizov2018-12-171-1/+3
| |_|_|_|/ |/| | | |
* | | | | Remove rails4 specific codeJasper Maes2018-12-161-6/+0
|/ / / /
* | | | Remove rails 4 support in CI, Gemfiles, bin/ and config/Jasper Maes2018-12-1417-335/+103
| | | |
* | | | Pass on arguments passed to the FeatureConstrainerBob Van Landuyt2018-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | All arguments passed to the `FeatureConstrainer` will be passed on to the `Feature.enabled?` check.
* | | | Enable GraphQL API endpointPhil Hughes2018-12-131-1/+1
| | | |
* | | | Fix deprecations in opclasses initializerYorick Peterse2018-12-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The use of `table_exists?` in the opclasses support initializer triggers a deprecation warning. Using `data_source_exists?` removes this deprecation.
* | | | Merge branch ↵Nick Thomas2018-12-121-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' Send a notification email on mirror update errors Closes #54650 See merge request gitlab-org/gitlab-ce!23595
| * | | Send a notification email on mirror update errorsAlejandro Rodríguez2018-12-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The email is sent to project maintainers containing the last mirror update error. This will allow maintainers to set alarms and react accordingly.
* | | | Move jest.config.js to root directoryWinnie Hellmann2018-12-111-28/+0
| | | |
* | | | Move emoji_menu_spec.js to JestWinnie Hellmann2018-12-111-0/+1
|/ / /
* | | Merge branch '53147-utilize-new-charting-library-for-metrics-dashboard' into ↵Clement Ho2018-12-081-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Utilize new charting library for metrics dashboard" See merge request gitlab-org/gitlab-ce!23459
| * | | Use GitLab UI area chartAdriel Santiago2018-12-071-3/+4
| | | | | | | | | | | | | | | | | | | | Replace the metrics dashboard graph with GitLab UI's area chart component
* | | | Integrate csslabClement Ho2018-12-081-0/+1
|/ / /
View Lorry Controller Status