summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Delete a container registry asynchronouslyStan Hu2018-09-071-0/+1
| | | | | | | | | | | | | When a container registry has many tags, it's easy for the DELETE call to take more than 60 seconds and fail. This can also leave the registry in a bad state with null bytes since some of the images have been deleted with tags still pointing to them. In addition, we have to prevent users from accidentally initiating the delete multiple times or this could leave the registry with orphaned tags. This commit also adds a flash message to notify the user the registry is scheduled for deletion. Closes #49926, #51063
* Merge branch 'alerts-for-built-in-metrics' into 'master'Grzegorz Bizon2018-09-071-18/+56
|\ | | | | | | | | | | | | Import common metrics into database. Closes gitlab-ee#6948 See merge request gitlab-org/gitlab-ce!21459
| * Merge branch 'master' into 'alerts-for-built-in-metrics'Kamil Trzciński2018-09-069-34/+115
| |\ | | | | | | | | | # Conflicts: # db/schema.rb
| * | Fix common_metrics.ymlKamil Trzciński2018-09-061-0/+1
| | |
| * | Split canary metrics into separate onesKamil Trzciński2018-09-061-1/+17
| | |
| * | Import common metrics into database.Kamil Trzciński2018-09-041-17/+38
| | | | | | | | | | | | | | | This MR backports PrometheusMetric model to CE and adds: common, identifier to figure out what kind of metric is used.
* | | Resolve "Improve handling of projects shared with a group"Dennis Tang2018-09-071-0/+3
| |/ |/|
* | Automatically disable Auto DevOps for project upon first pipeline failureMayra Cabrera2018-09-061-0/+1
| |
* | Merge branch 'fix-closing-issues' into 'master'Sean McGivern2018-09-062-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Fix closing issue default pattern Closes #51085 See merge request gitlab-org/gitlab-ce!21531
| * | Fix closing issue default patternSamuele Kaplun2018-09-062-2/+2
| | | | | | | | | | | | | | | | | | * (Suf)fix #51085 :-) Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
* | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-062-1/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix attachments not displaying inline with Google Cloud Storage Closes #49957 See merge request gitlab-org/gitlab-ce!21265
| * | | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-052-1/+30
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957
* | | Add User-Agent to production_json.logStan Hu2018-09-051-1/+2
|/ / | | | | | | | | This will help production gain more visibility which browsers may be having issues.
* | Add license info of unknown libraries to license_finder configuration ↵Balasankar "Balu" C2018-09-051-10/+18
| | | | | | | | instead of direct approval
* | Make MySQL patch for binary indexes compatible with composite indexesOlivier Gonzalez2018-09-041-2/+4
| |
* | Merge branch 'rails5-include-opclasses-in-schema-dump' into 'master'Yorick Peterse2018-09-041-19/+31
|\ \ | | | | | | | | | | | | Rails 5: include opclasses in rails 5 schema dump See merge request gitlab-org/gitlab-ce!21416
| * | Rails 5: include opclasses in rails 5 schema dumpJasper Maes2018-08-291-19/+31
| | |
* | | Rails 5: support schema t.index for mysqlJasper Maes2018-09-031-0/+28
| |/ |/|
* | Move badge settings to general settingsWinnie Hellmann2018-09-032-2/+0
| |
* | Merge branch 'sh-bump-unauth-expiration' into 'master'Douwe Maan2018-09-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Bump unauthenticated session time from 1 hour to 2 hours Closes #50393 See merge request gitlab-org/gitlab-ce!21453
| * | Bump unauthenticated session time from 1 hour to 2 hoursStan Hu2018-08-311-1/+1
| |/ | | | | | | | | | | | | | | | | | | Users who have their system clocks configured inconsistently due to Daylight Savings may see a GitLab session cookie that immediately expires, resulting in a 422 error. To avoid these errors, we can bump the unauthenticated session time from 1 hour to 2 hours so they have time to login and get the default 7-day session. Closes #50393
* | Merge branch 'sh-disable-sidekiq-session' into 'master'Sean McGivern2018-09-031-0/+6
|\ \ | | | | | | | | | | | | Disable the Sidekiq Admin Rack session See merge request gitlab-org/gitlab-ce!21441
| * | Disable the Sidekiq Admin Rack sessionStan Hu2018-08-311-0/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | GitLab already has its own session store, so this extra Sidekiq session is unnecessary. In addition, the GitLab session store properly sets the Secure flag, unlike the default Rack session. CSRF protection in the Sidekiq /admin page continues to work with the existing GitLab session. See https://github.com/mperham/sidekiq/pull/3183 for more details. Part of #49120
* | Merge branch 'winh-ignore-npm-devdependencies' into 'master'Phil Hughes2018-09-031-0/+7
|\ \ | |/ |/| | | | | Exclude frontend development dependencies from license restrictions See merge request gitlab-org/gitlab-ce!21430
| * Exclude frontend development dependencies from license restrictionsWinnie Hellmann2018-08-301-0/+7
| |
* | [master] Missing CSRF in System Hooks resend actionFrancisco Javier López2018-08-282-2/+2
| |
* | Merge branch 'issue_36138' into 'master'Sean McGivern2018-08-281-1/+1
|\ \ | |/ |/| | | | | | | | | Allow to delete group milestones Closes #36138 See merge request gitlab-org/gitlab-ce!21057
| * Allow to delete group milestonesissue_36138Felipe Artur2018-08-061-1/+1
| |
* | Bump fog-google to 1.7.1 and google-api-client to 0.23.0sh-bump-fog-googleStan Hu2018-08-211-1/+1
| | | | | | | | | | | | | | This is needed to support query parameters in `Fog::Storage::Google`. See https://github.com/fog/fog-google/pull/409. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/49957
* | Backport of gitlab-org/gitlab-ee!6876ce-6752-jira-branchesMario de la Ossa2018-08-201-0/+7
| |
* | Merge branch 'rails5-verbose-query-logs' into 'master'Robert Speicher2018-08-161-1/+3
|\ \ | | | | | | | | | | | | Rails5: Enable verbose query logs See merge request gitlab-org/gitlab-ce!21231
| * | Rails5: Enable verbose query logsJasper Maes2018-08-161-1/+3
| | |
* | | Frontend: Proper gettext extraction with gettext-extractor🌴🇿🇦 Lukas Eipert (OOO until Summit)2018-08-161-0/+15
| | |
* | | Add ci_archive_traces_cron_worker configuration to gitlab.yml.exampleShinya Maeda2018-08-161-0/+3
|/ /
* | Merge branch 'enable-verbose-query-logs' into 'master'Robert Speicher2018-08-071-0/+54
|\ \ | | | | | | | | | | | | Enable verbose query logging See merge request gitlab-org/gitlab-ce!20976
| * | Enable verbose query loggingenable-verbose-query-logsKamil Trzciński2018-08-071-0/+54
| | | | | | | | | | | | | | | This backports the https://github.com/rails/rails/pull/26815 and enables that for non-Rails5 and non-production environments.
* | | Web IDE & CodeSandboxPhil Hughes2018-08-071-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables JavaScripts projects to have live previews straight in the browser without requiring any local configuration. This uses the CodeSandbox package `sandpack` to compile it all inside of an iframe. This feature is off by default and can be toggled on in the admin settings. Only projects with a `package.json` and a `main` key are supported. Updates happen in real-time with hot-reloading. We just watch for changes to files and then send them to `sandpack` to allow it to reload the iframe. The iframe includes a very simple navigation bar, the text bar is `readonly` to stop users navigating away from the preview and the back and forward buttons just pop/splice the navigation stack which is tracked by a listener on `sandpack` There is a button inside the iframe which allows the user to open the projects inside of CodeSandbox. This button is only visible on **public** projects. On private or internal projects this button get hidden to protect private code being leaked into an external public URL. Closes #47268
* | | Merge branch 'sh-support-bitbucket-server-import' into 'master'Tim Zallmann2018-08-061-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for Bitbucket Server imports Closes #25393 See merge request gitlab-org/gitlab-ce!20164
| * \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-317-8/+37
| |\ \ \ | | |/ /
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-276-3/+16
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-256-54/+29
| |\ \ \
| * \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-202-1/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-192-6/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-181-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-175-9/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-122-0/+11
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-094-5/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-073-3/+3
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-054-78/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into sh-support-bitbucket-server-importStan Hu2018-07-034-54/+55
| |\ \ \ \ \ \ \ \ \ \ \ \