summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classesPaul Slaughter2019-05-131-4/+0
| | | | | | | | They were introduced in [this mr][1], with the intention of using the. Appaarently the usage was removed during review, but the new classes accidentally stayed around. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24724
* Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-131-0/+5
|\ | | | | | | | | Adds changelog entry for Matomo string website ID support See merge request gitlab-org/gitlab-ce!28244
| * Adds changelog entry for Matomostring website ID supportCDuv2019-05-101-0/+5
| |
* | Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat2019-05-137-33/+34
|\ \ | | | | | | | | | | | | Fix E2E test - wait for branches to not be present See merge request gitlab-org/gitlab-ce!27805
| * | Add branch_name qa selectorqa-ml-fix-branches-testMark Lapierre2019-05-075-16/+28
| | | | | | | | | | | | | | | | | | Uses the branch_name element to find a branch with a specific name, instead of using a dynamic CSS class that can't be validated by the sanity selector test
| * | Check test result via an assertionMark Lapierre2019-05-012-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | As long as `has_no_branch?` is only called in an assertion it shouldn't matter if it could return false but still allow the test to continue. So we don't need the new wait method
| * | Make max wait time a constantMark Lapierre2019-05-011-1/+3
| | | | | | | | | | | | So it can be used elsewhere in the code
| * | Wait for branches to not be presentMark Lapierre2019-04-292-14/+9
| | | | | | | | | | | | | | | | | | When testing if branches are deleted, wait for the branch element to not be present. Do the same for both checks (second and third branches).
* | | Merge branch 'bvl-fix-graphql-autoloading' into 'master'Nick Thomas2019-05-131-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Eager load the GraphQL schema in specs Closes gitlab-ee#11497 See merge request gitlab-org/gitlab-ce!28246
| * | | Eager load the GraphQL schema in specsBob Van Landuyt2019-05-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid counting on Rails eager loading the GraphQL types, but preload them before the specs. This would avoid loading the schema in 2 separate threads concurrently (1 inside the specs, 1 inside the test-server that will receive requests). Loading the schema in parallel like that could cause duplicate definition errors.
* | | | Merge branch 'explain-artifacts-server-configuration-docs' into 'master'Nick Thomas2019-05-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Expain usage of `artifacts_server` in `gitlab.yml` See merge request gitlab-org/gitlab-ce!28230
| * | | | Expain usage of `artifacts_server` in `gitlab.yml`explain-artifacts-server-configuration-docsKrasimir Angelov2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add comment to clarify intended usage of `artifacts_server`. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/49475.
* | | | | Merge branch 'graphql-docs-fix' into 'master'Phil Hughes2019-05-131-2/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update doc/development/fe_guide/graphql.md See merge request gitlab-org/gitlab-ce!28272
| * | | | | Update doc/development/fe_guide/graphql.mdNatalia Tepluhina2019-05-131-2/+6
|/ / / / /
* | | | | Merge branch 'docs-update-salesforce-documentation' into 'master'Evan Read2019-05-121-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Fix wording error in salesforce section See merge request gitlab-org/gitlab-ce!28190
| * | | | | Docs: Fix wording error in salesforce sectionGosia Ksionek2019-05-121-4/+4
|/ / / / /
* | | | | Merge branch 'patch-31' into 'master'Evan Read2019-05-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix typos in new_ci_build_permissions_model.md See merge request gitlab-org/gitlab-ce!28087
| * | | | | fix typos in new_ci_build_permissions_model.mdBen Bodenmiller2019-05-041-2/+2
| | | | | |
* | | | | | Merge branch 'updateWebhooksIssueMR' into 'master'Achilleas Pipinellis2019-05-121-4/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update webhooks examples of Issue and MR in documentation Closes #61187 See merge request gitlab-org/gitlab-ce!27897
| * | | | | | update `updated_at`field tooManeschi Romain2019-05-121-4/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | Not my initial idea but when I write the issue I see this field is wrong
* | | | | | Merge branch 'docs-k8s-apps-architecture-overview' into 'master'Achilleas Pipinellis2019-05-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update K8S apps to checkmark See merge request gitlab-org/gitlab-ce!28259
| * | | | | | Update K8S apps to checkmarkk8s-apps-architecture-overviewMatija Čupić2019-05-101-1/+1
| | | | | | |
* | | | | | | Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu2019-05-112-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-102-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
* | | | | | | | Merge branch 'sh-update-process-mem' into 'master'Ash McKenzie2019-05-112-1/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Update get_process_mem to 0.2.3 See merge request gitlab-org/gitlab-ce!28248
| * | | | | | | Update get_process_mem to 0.2.3sh-update-process-memStan Hu2019-05-102-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This squelches a BigDecimal warning in Ruby 2.6: warning: BigDecimal.new is deprecated; use BigDecimal() method instead. https://github.com/schneems/get_process_mem/blob/master/CHANGELOG.md
* | | | | | | | Merge branch 'winh-frontend-test-waiting-docs' into 'master'Mike Lewis2019-05-101-1/+182
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide alternatives to using setTimeout in frontend tests (docs) Closes #49612 See merge request gitlab-org/gitlab-ce!28207
| * | | | | | | | Provide alternatives to using setTimeout in frontend testswinh-frontend-test-waiting-docsWinnie Hellmann2019-05-091-1/+182
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-add-omnibus-secrets' into 'master'Grzegorz Bizon2019-05-101-0/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add warning about updating Omnibus is secrets are updated See merge request gitlab-org/gitlab-ce!28247
| * | | | | | | | | Add warning about updating Omnibus is secrets are updatedsh-add-omnibus-secretsStan Hu2019-05-101-0/+11
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch '61550-next-badge' into 'master'Phil Hughes2019-05-102-1/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249
| * | | | | | | | Fixes next badge being always visible61550-next-badgeFilipa Lacerda2019-05-102-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'Lin Jen-Shin2019-05-101-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unrelated errors when teardowning quanrantined specs See merge request gitlab-org/gitlab-ce!28240
| * | | | | | | | Fix unrelated errors when teardowning quanrantined specsavoid-unrelated-errors-in-quarantined-specsRémy Coutable2019-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're skipping the example in a before hook, the @_subscribers instance variable that is normally set in the setup phase of the test by https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L21 isn't set but the teardown phase of the example still happens and tries to iterate over the array of subcribers: https://github.com/rails/rails-controller-testing/blob/21014e48be124dd8d0af250b79f682519d445015/lib/rails/controller/testing/template_assertions.rb#L54 Using an around hook allows the @_subscribers instance variable to be set. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'update-ci-minutes-doc' into 'master'Achilleas Pipinellis2019-05-101-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update CI minutes docs to reflect this is available to all plans See merge request gitlab-org/gitlab-ce!28237
| * | | | | | | | Update CI minutes docs to reflect this is available to all plansJames Lopez2019-05-101-2/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre2019-05-103-2/+35
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properly handle LFS Batch API response in project import Closes #61624 See merge request gitlab-org/gitlab-ce!28223
| * | | | | | | Properly handle LFS Batch API response in project importsh-fix-lfs-download-errorsStan Hu2019-05-093-2/+35
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project imports were failing with `undefined method each_with_object for String` because the import was attempting to parse the LFS Batch API and failing due to the fact that the Content-Type wasn't a supported format (e.g. application/vnd.git-lfs+json instead of application/json). We now parse the body as JSON. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61624
* | | | | | | Merge branch 'winh-simplify-frontend-fixtures' into 'master'Rémy Coutable2019-05-1030-165/+98
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify frontend test fixtures See merge request gitlab-org/gitlab-ce!27531
| * | | | | | | Remove trailing empty lineswinh-simplify-frontend-fixturesWinnie Hellmann2019-05-102-6/+0
| | | | | | | |
| * | | | | | | Remove unused fixture_file_name parametersWinnie Hellmann2019-05-103-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed -E -e 's/(, ){0,1}(fixture_file_name| example\.description)(, ){0,1}//' < $f > $f.tmp; mv $f.tmp $f done
| * | | | | | | Remove example block parametersWinnie Hellmann2019-05-1027-56/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed 's/do |example|/do/' < $f > $f.tmp; mv $f.tmp $f done
| * | | | | | | Remove duplicate store_frontend_fixture() callsWinnie Hellmann2019-05-1027-44/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for f in $(find spec/javascripts/fixtures/ -name '*.rb') do grep -v store_frontend_fixture < $f > $f.tmp; mv $f.tmp $f done
| * | | | | | | Merge balsamiq fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| | | | | | | |
| * | | | | | | Merge PDF fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| | | | | | | |
| * | | | | | | Expose response variable for raw file fixturesWinnie Hellmann2019-05-101-7/+8
| | | | | | | |
| * | | | | | | Call store_frontend_fixture() in JavaScriptFixturesHelpersWinnie Hellmann2019-05-101-7/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600Rémy Coutable2019-05-103-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass" Closes #60180 See merge request gitlab-org/gitlab-ce!28206
| * | | | | | | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-103-0/+13
|/ / / / / / /
* | | | | | | Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-05-102-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't run full gc in AfterImportService Closes gitlab-ee#11556 See merge request gitlab-org/gitlab-ce!28239