summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed list to improve flow and clarityMattPennaThe3rd-EmailConfMatt Penna2019-07-201-5/+3
|
* Fixed broken listMatt Penna2019-07-191-0/+1
|
* Added email confirmation screenshotMatt Penna2019-07-191-0/+0
|
* Documented email confirmation signup restrictionMatt Penna2019-07-191-5/+15
|
* Merge branch '64731-fix-project-auto-devops-api' into 'master'Mayra Cabrera2019-07-195-21/+45
|\ | | | | | | | | Fix the project auto devops API See merge request gitlab-org/gitlab-ce!30946
| * Fix the project auto devops APINick Thomas2019-07-195-21/+45
|/ | | | | | | | | | | | | If `project_auto_devops.enabled` is nil for a project, when setting any auto devops values via the API, we try to create a new row in the DB, instead of re-using the existing one. This leads to the project_id being set to nil, and the database `NOT NULL` constraint leading to a 500 response. This commit resolves the issue by correctly detecting the presence of a ProjectAutoDevops row and re-using it. Persistence is also moved away from explicit `update!` calls and into relying on `autosave: true` on the model.
* Merge branch 'sh-fix-gitaly-server-info-cache' into 'master'Mayra Cabrera2019-07-193-1/+19
|\ | | | | | | | | | | | | Fix Gitaly auto-detection caching Closes #64802 See merge request gitlab-org/gitlab-ce!30954
| * Fix Gitaly auto-detection cachingStan Hu2019-07-193-1/+19
| | | | | | | | | | | | | | | | If `GitalyClient#can_use_disk?` returned `false`, it was never cached properly and led to excessive number of Gitaly calls. Instead of using `cached_value.present?`, we need to check `cached_value.nil?`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64802
* | Merge branch '64160-fix-duplicate-buttons' into 'master'Fatih Acet2019-07-193-17/+19
|\ \ | | | | | | | | | | | | | | | | | | Remove duplicate buttons Closes #64160 See merge request gitlab-org/gitlab-ce!30757
| * | Remove duplicate buttons64160-fix-duplicate-buttonsSamantha Ming2019-07-173-17/+19
| | |
* | | Merge branch 'tc-database-review-process' into 'master'Nick Thomas2019-07-1910-42/+196
|\ \ \ | | | | | | | | | | | | | | | | Document database review process See merge request gitlab-org/gitlab-ce!30405
| * | | Document database review processToon Claes2019-07-1910-42/+196
|/ / / | | | | | | | | | See https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/6069
* | | Merge branch '30939-remove-worker-label-from-ruby-sampler-metrics' into 'master'Kamil Trzciński2019-07-191-19/+6
|\ \ \ | | | | | | | | | | | | | | | | Get rid of `worker_label` in RubySampler See merge request gitlab-org/gitlab-ce!30942
| * | | Get rid of `worker_label` in RubySampler30939-remove-worker-label-from-ruby-sampler-metricsAleksei Lipniagov2019-07-191-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | We have Prometheus::PidProvider which sets correct worker id for a process, so such implementation of `worker_label` in the sampler is obsolete.
* | | | Merge branch 'fj-avoid-incresaing-usage-ping-when-not-enabled' into 'master'Nick Thomas2019-07-193-0/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid increasing redis counters when usage_ping is disabled See merge request gitlab-org/gitlab-ce!30949
| * | | | Avoid increasing redis counters when usage_ping is disabledFrancisco Javier López2019-07-193-0/+40
|/ / / /
* | | | Merge branch 'fix-alignment-on-security-reports' into 'master'Phil Hughes2019-07-193-4/+7
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fixes the alignment on reports See merge request gitlab-org/gitlab-ce!30839
| * | | Fixes the alignment on reportsSam Beckham2019-07-193-4/+7
|/ / / | | | | | | | | | - Removes a justify-center class that causes reports to centrally align
* | | Merge branch '64265-center-loading-icon' into 'master'Phil Hughes2019-07-192-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Centers loading icon in CI action Closes #64265 See merge request gitlab-org/gitlab-ce!30947
| * | | Centers loading icon in CI actionFilipa Lacerda2019-07-192-0/+10
| | | |
* | | | Merge branch 'add-metadata-to-epic-list-view-ce' into 'master'Sean McGivern2019-07-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use `issuable_path` helper See merge request gitlab-org/gitlab-ce!30913
| * | | | Use issuable_path to allow support of epicsBrett Walker2019-07-181-2/+2
| | | | |
* | | | | Merge branch '64722-mg-export-frontend-fixtures' into 'master'Phil Hughes2019-07-1968-81/+137
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Export frontend fixtures as pipeline artifact" Closes #64722 and #59166 See merge request gitlab-org/gitlab-ce!30917
| * | | | | Add missing static fixture64722-mg-export-frontend-fixturesMike Greiling2019-07-191-0/+29
| | | | | |
| * | | | | Move frontend fixtures into spec/frontendMike Greiling2019-07-1961-20/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves every fixture source file from spec/javascripts to spec/frontend
| * | | | | Save fixtures as pipeline artifactsMike Greiling2019-07-191-0/+2
| | | | | |
| * | | | | Move frontend fixtures to tmp/testsMike Greiling2019-07-195-8/+16
| | | | | |
| * | | | | Rename the karma:fixtures taskMike Greiling2019-07-195-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces frontend:fixtures rake task to replace karma:fixtures and update documentation and CI scripts to match
| * | | | | Backport line changes from EEMike Greiling2019-07-192-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | EE-specific line changes were introduced in the following MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12680 This change resolves most of them
| * | | | | Don't kill the fixtures directory between testsMike Greiling2019-07-191-1/+1
| | | | | |
| * | | | | Prefer an absolute path over cwd()Mike Greiling2019-07-191-3/+4
| | | | | |
| * | | | | Resolve annoying deprecation warningsMike Greiling2019-07-1826-38/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DEPRECATION WARNING: The success? predicate is deprecated and will be removed in Rails 6.0. Please use successful? ...
* | | | | | Merge branch '64784-re-name-regression' into 'master'Kushal Pandya2019-07-192-4/+45
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression in re-naming files Closes #64784 See merge request gitlab-org/gitlab-ce!30941
| * | | | | Fixed regression for re-naming files in WebIDE64784-re-name-regressionDenys Mishunov2019-07-192-4/+45
| | | | | |
* | | | | | Merge branch 'bjk/64064_cache_metrics' into 'master'Bob Van Landuyt2019-07-194-4/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust redis cache metrics See merge request gitlab-org/gitlab-ce!30572
| * | | | | | Adjust redis cache metricsBen Kochie2019-07-194-4/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove `controller` and `action` labels from duration histogram. * Create a new simple counter for `controller` and `action`. * Adjust histogram buckets to observe smaller response times.
* | | | | | Merge branch 'qa/better-scope-one-more-test' into 'master'Sanad Liaquat2019-07-191-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better scope end-to-end test See merge request gitlab-org/gitlab-ce!30897
| * | | | | | Better scope end-to-end testqa/better-scope-one-more-testWalmyr Lima2019-07-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, and leave only the test steps and verifications in the it block.
* | | | | | | Merge branch 'qa/better-scope-another-test' into 'master'Sanad Liaquat2019-07-191-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better scope another end-to-end test See merge request gitlab-org/gitlab-ce!30896
| * | | | | | | Better scope end-to-end testqa/better-scope-another-testWalmyr Lima2019-07-181-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, remove unnecessary expectation, and leave only the test steps and verifications in the it block.
* | | | | | | Merge branch 'sl-qa-staging-66-quarantine-failing-spec' into 'master'Sanad Liaquat2019-07-191-1/+2
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Quarantine failing "rebase_merge_request_spec.rb" See merge request gitlab-org/gitlab-ce!30933
| * | | | | | Quarantine failing specsl-qa-staging-66-quarantine-failing-specSanad Liaquat2019-07-191-1/+2
| | | | | | |
* | | | | | | Merge branch 'fj-count-web-ide-merge-requests' into 'master'Nick Thomas2019-07-1913-13/+136
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web IDE Usage Ping for Create SMAU Closes #63886 See merge request gitlab-org/gitlab-ce!30800
| * | | | | | | Added Usage Data for some Web IDE actionsFrancisco Javier López2019-07-1913-13/+136
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actions tracked in the web IDE are: - creation of commits - creation of merge requests - projects loaded
* | | | | | | Merge branch 'qa/better-scode-test' into 'master'Walmyr2019-07-191-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better scope end-to-end test See merge request gitlab-org/gitlab-ce!30895
| * | | | | | | Better scope end-to-end testqa/better-scode-testWalmyr Lima2019-07-181-1/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Move test pre-conditions to before block, and leave only the test steps and verifications in the it block.
* | | | | | | Merge branch '64613-add-note-about-private-profile-in-docs' into 'master'Mike Lewis2019-07-191-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about private_profile changes in 12.1 Closes #64613 See merge request gitlab-org/gitlab-ce!30772
| * | | | | | | Add a note about private_profile changes in 12.1Adam Hegyi2019-07-191-0/+3
|/ / / / / / /
* | | | | | | Merge branch 'docs-for-merge-train-parallel-pipelines' into 'master'Marcia Ramos2019-07-193-21/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentations for parallel execution strategy for Merge Trains Closes #63369 See merge request gitlab-org/gitlab-ce!30661
| * | | | | | | Documentations for parallel execution strategy for Merge TrainsShinya Maeda2019-07-193-21/+27
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a documentation for parallel pipelines on merge trains. Fix typo
View Lorry Controller Status