summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-111-0/+4
|\ | | | | | | | | Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
| * Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-101-0/+4
| | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
|/ | | | [ci skip]
* Generate Let's Encrypt private keyVladimir Shushlin2019-05-091-1/+6
|
* Remove from providers with iconGosia Ksionek2019-05-071-0/+4
| | | | | | Remove puts Remove puts
* Merge branch 'winh-separate-frontend-fixtures' into 'master'Phil Hughes2019-05-071-1/+4
|\ | | | | | | | | Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport) See merge request gitlab-org/gitlab-ce!28032
| * Load EE fixtures from ee/ directory in KarmaWinnie Hellmann2019-05-021-1/+4
| | | | | | | | (cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)
* | Merge branch 'instance_level_clusters' into 'master'Bob Van Landuyt2019-05-071-0/+2
|\ \ | | | | | | | | | | | | Instance level k8s clusters See merge request gitlab-org/gitlab-ce!27196
| * | Instance level kubernetes clusters adminJames Fargher2019-05-071-0/+2
| | | | | | | | | | | | | | | Instance level clusters were already mostly supported, this change adds admin area controllers for cluster CRUD
* | | Additional fix to handle NULL lock_versionsh-fix-activerecord-patch-mark2Stan Hu2019-05-061-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | If the UI sends a string value for lock_version (e.g. "0"), then the previous monkey patch did not properly handle that properly. This commit casts the value to an integer to determine whether to look for NULL lock_versions. For merge requests, GitLab sends a POST request to `namespace/project/merge_requests/:iid` with the `merge_request[lock_version]` parameter with a string `0`. The string value comes from the form field, which explains why https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28145 wasn't sufficient.
* | Fix editing issues and MRs with NULL lock_versionSean McGivern2019-05-061-0/+41
| |
* | Run rubocop -a on CE filessh-upgrade-rubocop-0.68.0-ceStan Hu2019-05-051-1/+1
| |
* | Include all queries in the performance bar summarySean McGivern2019-05-031-0/+12
|/ | | | | | | | | | | | Rails 5.1's `exec_no_cache` doesn't call `async_exec` any more, but `exec_params`: https://github.com/rails/rails/pull/33188 This means that the DB summary in the performance bar was wrong. The individual query details were still correct (we subscribe to ActiveRecord events for those). We can remove this once the upstream PR to peek-pg is in a release and we update to use that release.
* Adds a way to start multiple manual jobs in stageMayra Cabrera2019-05-021-0/+6
| | | | | | | | | | - Adds an endpoint on PipelinesController - Adds a service that iterates over every build in a stage and plays it. - Includes 'play_manual' details on EntitySerializer - Builds a new Stage state: PlayManual. An stage can take this status if it has manual builds or an skipped, scheduled or manual status - Includes FE modifications and specs
* Allow Sentry client-side DSN to be passed on gitlab.ymlDouglas Barbosa Alexandre2019-05-012-0/+2
|
* Merge branch 'winh-binary-fixture-path' into 'master'Phil Hughes2019-05-011-1/+1
|\ | | | | | | | | Use FIXTURES_PATH constant for binary fixtures in frontend tests See merge request gitlab-org/gitlab-ce!27891
| * Use FIXTURES_PATH for loading test.pdfWinnie Hellmann2019-04-301-1/+1
| |
| * Use FIXTURES_PATH in balsamiq_viewer_integration_spec.jsWinnie Hellmann2019-04-301-1/+1
| |
* | Merge branch 'feat/sentry-environment' into 'master'Douglas Barbosa Alexandre2019-04-303-0/+16
|\ \ | | | | | | | | | | | | feat: add option to define the Sentry Environment See merge request gitlab-org/gitlab-ce!27091
| * | feat: allow Sentry configuration to be passed on gitlab.ymlRoger Meier2019-04-303-0/+16
| | |
* | | Merge branch '60965-referencing-issues-or-epics-by-url-fails-with-404' into ↵Douglas Barbosa Alexandre2019-04-301-0/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Referencing issues or epics by URL fails with 404" Closes #61099 and #60965 See merge request gitlab-org/gitlab-ce!27827
| * | Don't allow a relative_url_root of '/'Sean McGivern2019-04-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will fail in a few ways: 1. We might end up having a path (not a URL) starting with `//`, which will be interpreted by browsers as a protocol-relative URL. 2. Issue, MR, snippet, etc. reference parsing will look for URLs at `http://gitlab.example.com//project/...`, with the double slash preventing single slashes from working. In general, it doesn't seem like there's a valid case for this.
* | | Remove disabled pages domainsVladimir Shushlin2019-04-301-0/+4
| |/ |/| | | | | | | Domain will be removed by verification worker after 1 week of being disabled
* | DELETE clusters/:id/:application endpointThong Kuah2019-04-291-0/+1
| | | | | | | | Add endpoint to delete/uninstall a cluster application
* | Merge branch ↵Ash McKenzie2019-04-301-1/+0
|\ \ | |/ |/| | | | | | | | | | | | | '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master' Delete leftover code for referenced_merge_requests endpoint Closes #60476 See merge request gitlab-org/gitlab-ce!27335
| * Delete leftover code for referenced_merge_requests60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varianFatih Acet2019-04-151-1/+0
| | | | | | | | | | | | | | We rewrote Related MRs widget using Vue. The previous implementation was using Haml templates and calling referenced_merge_requests endpoint which is now deprecated. This MR deletes leftover stuff them.
* | Merge branch '60383-setup-dashboard-endpoint' into 'master'Grzegorz Bizon2019-04-281-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Create dashboards endpoint & setup dashboard post-processing Closes #60383 See merge request gitlab-org/gitlab-ce!27405
| * | Use existing common metricssyasonik2019-04-241-274/+0
| | |
| * | Add inital dashboard endpoint supportsyasonik2019-04-242-0/+275
| | |
* | | Add ProjectMetricsDashboardSetting model and tableReuben Pereira2019-04-261-0/+2
| | | | | | | | | | | | | | | | | | This new table will be used to store the external_dashboard_url which allows users to add a link to their external dashboards (ex Grafana) to the Metrics dashboard.
* | | Fix Sidekiq initializer fileValery Sizov2019-04-251-12/+12
| | |
* | | Enable Reliable fetcher by defaultValery Sizov2019-04-251-3/+14
|/ /
* | Fix project auto dev ops failureHeinrich Lee Yu2019-04-231-0/+2
| |
* | Bump Rails version to 5.1.7Heinrich Lee Yu2019-04-232-45/+0
| | | | | | | | Removes unneeded patches
* | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-238-175/+70
| | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | Merge branch '60383-change-common-metrics-schema' into 'master'Douwe Maan2019-04-191-109/+52
|\ \ | | | | | | | | | | | | | | | | | | Change the schema of common_metrics.yml Closes #60383 See merge request gitlab-org/gitlab-ce!27283
| * | Change dashboard order attribute to priority60383-change-common-metrics-schemarpereira22019-04-171-1/+1
| | | | | | | | | | | | | | | | | | Dashboards will be ordered in descending order of priority. The word 'priority' seems to signify descending order while 'order' signifies ascending order.
| * | Remove required_metrics and series attributesrpereira22019-04-171-81/+0
| | | | | | | | | | | | - They are not used by the frontend.
| * | Change the schema of the common_metrics.ymlrpereira22019-04-171-31/+55
| | | | | | | | | | | | | | | - Change it to the new dashboard syntax described here: https://gitlab.com/gitlab-org/gitlab-ce/issues/60383.
* | | Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-183-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* | | Bump version of knative from 0.3 -> 0.5Chris Baumbauer2019-04-171-1/+1
|/ /
* | Added write_repository scope for personal access tokenHoratiu Eugen Vlad2019-04-151-1/+4
| |
* | Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizerDmitriy Zaporozhets2019-04-121-2/+0
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-111-0/+15
|\ | | | | | | | | | | | | Revert "Remove HipChat integration from GitLab" Closes #60042 See merge request gitlab-org/gitlab-ce!27172
| * Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-101-0/+1
| |
| * Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-101-0/+14
| | | | | | | | This reverts commit a5378665a1dc0b9c8dc3a4fa279a0eb78aac5aac.
* | Disable method instrumentation for diffsStan Hu2019-04-101-1/+0
| | | | | | | | | | | | | | | | | | When there a large number of discussions on diffs, the instrumentation has a significant impact on performance since it's often run in a tight loop for line position calculation etc. We should disable this since there are other ways to benchmark performance. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52898
* | Add doc link to omnibus for changing gitlab.ymlDmitriy Zaporozhets2019-04-101-1/+2
|/
* Merge branch 'delay-update-statictics' into 'master'Douwe Maan2019-04-091-1/+2
|\ | | | | | | | | Fix the bug that the project statistics is not updated See merge request gitlab-org/gitlab-ce!26854
| * Fix the bug that the project statistics is not updatedHiroyuki Sato2019-04-051-1/+2
| |
View Lorry Controller Status