summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* 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
|/ / /
* | | Allow public forks to be deduplicatedZeger-Jan van de Weg2018-12-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is forked, the new repository used to be a deep copy of everything stored on disk by leveraging `git clone`. This works well, and makes isolation between repository easy. However, the clone is at the start 100% the same as the origin repository. And in the case of the objects in the object directory, this is almost always going to be a lot of duplication. Object Pools are a way to create a third repository that essentially only exists for its 'objects' subdirectory. This third repository's object directory will be set as alternate location for objects. This means that in the case an object is missing in the local repository, git will look in another location. This other location is the object pool repository. When Git performs garbage collection, it's smart enough to check the alternate location. When objects are duplicated, it will allow git to throw one copy away. This copy is on the local repository, where to pool remains as is. These pools have an origin location, which for now will always be a repository that itself is not a fork. When the root of a fork network is forked by a user, the fork still clones the full repository. Async, the pool repository will be created. Either one of these processes can be done earlier than the other. To handle this race condition, the Join ObjectPool operation is idempotent. Given its idempotent, we can schedule it twice, with the same effect. To accommodate the holding of state two migrations have been added. 1. Added a state column to the pool_repositories column. This column is managed by the state machine, allowing for hooks on transitions. 2. pool_repositories now has a source_project_id. This column in convenient to have for multiple reasons: it has a unique index allowing the database to handle race conditions when creating a new record. Also, it's nice to know who the host is. As that's a short link to the fork networks root. Object pools are only available for public project, which use hashed storage and when forking from the root of the fork network. (That is, the project being forked from itself isn't a fork) In this commit message I use both ObjectPool and Pool repositories, which are alike, but different from each other. ObjectPool refers to whatever is on the disk stored and managed by Gitaly. PoolRepository is the record in the database.
* | | Merge branch 'dm-remove-prune-web-hook-logs-worker' into 'master'Robert Speicher2018-12-071-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove RemoveOldWebHookLogsWorker Closes #52592 See merge request gitlab-org/gitlab-ce!23628
| * | | Remove RemoveOldWebHookLogsWorkerDouwe Maan2018-12-071-4/+0
| | | |
* | | | Merge branch 'store-correlation-logs' into 'master'Stan Hu2018-12-074-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Log and pass correlation-id between Unicorn, Sidekiq and Gitaly See merge request gitlab-org/gitlab-ce!22844
| * | | | Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński2018-12-064-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Correlation ID is taken or generated from received X-Request-ID. Then it is being passed to all executed services (sidekiq workers or gitaly calls). The Correlation ID is logged in all structured logs as `correlation_id`.
* | | | | Merge branch 'jprovazn-fast-upload-delete' into 'master'Grzegorz Bizon2018-12-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use FastDestroy for deleting uploads Closes #46069 See merge request gitlab-org/gitlab-ce!20977
| * | | | | Use FastDestroy for deleting uploadsJan Provaznik2018-12-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It gathers list of file paths to delete before destroying the parent object. Then after the parent_object is destroyed these paths are scheduled for deletion asynchronously. Carrierwave needed associated model for deleting upload file. To avoid this requirement, simple Fog/File layer is used directly for file deletion, this allows us to use just a simple list of paths.
* | | | | | Merge branch 'mg-upgrade-gitlab-ui' into 'master'Filipa Lacerda2018-12-061-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab-ui dependency See merge request gitlab-org/gitlab-ce!23611
| * | | | | | Adds a reference to the echarts licence fileSam Beckham2018-12-061-1/+1
| | | | | | |
| * | | | | | Add missing license manager change attributionMike Greiling2018-12-061-2/+2
| | | | | | |
| * | | | | | Upgrade gitlab-ui to latest and approve echarts dependencyMike Greiling2018-12-061-0/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sh-fix-issue-54718' into 'master'Robert Speicher2018-12-061-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Sidekiq feature flag check if features table does not exist Closes #54718 See merge request gitlab-org/gitlab-ce!23639
| * | | | | Disable Sidekiq feature flag check if features table does not existStan Hu2018-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GitLab Development Kit initialization failed because the Sidekiq initializer was attempting to look up a feature flag when the `features` table hadn't been created yet. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54718
* | | | | | Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre2018-12-062-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow internal references to be removed Closes #19376 See merge request gitlab-org/gitlab-ce!23189
| * | | | | Use BFG object maps to clean projectsNick Thomas2018-12-062-0/+2
| | | | | |
* | | | | | Introduce Knative Serverless TabDylan Griffith2018-12-061-0/+4
|/ / / / /
* | | | | Support RSA and ECDSA algorithms in Omniauth JWTMichael Tsyganov2018-12-051-8/+8
|/ / / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'winh-add-jest' into 'master'Mike Greiling2018-12-051-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Setup Jest test environment See merge request gitlab-org/gitlab-ce!23406