Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-05-13Merge branch 'qa-ml-fix-branches-test' into 'master'Sanad Liaquat
Fix E2E test - wait for branches to not be present See merge request gitlab-org/gitlab-ce!27805
2019-05-13Merge branch 'bvl-fix-graphql-autoloading' into 'master'Nick Thomas
Eager load the GraphQL schema in specs Closes gitlab-ee#11497 See merge request gitlab-org/gitlab-ce!28246
2019-05-13Merge branch 'explain-artifacts-server-configuration-docs' into 'master'Nick Thomas
Expain usage of `artifacts_server` in `gitlab.yml` See merge request gitlab-org/gitlab-ce!28230
2019-05-13delete feature flag when disabling RuggedBen Bodenmiller
2019-05-13Ensure that dependencies are installed before running frontend testsWinnie Hellmann
2019-05-13Merge branch 'graphql-docs-fix' into 'master'Phil Hughes
Update doc/development/fe_guide/graphql.md See merge request gitlab-org/gitlab-ce!28272
2019-05-13Update doc/development/fe_guide/graphql.mdNatalia Tepluhina
2019-05-13Rename methods that conflict in Rails 5.2Heinrich Lee Yu
Adds suffix to enum methods and changes `in_groups` to `of_groups`
2019-05-12Merge branch 'docs-update-salesforce-documentation' into 'master'Evan Read
Docs: Fix wording error in salesforce section See merge request gitlab-org/gitlab-ce!28190
2019-05-12Docs: Fix wording error in salesforce sectionGosia Ksionek
2019-05-12Merge branch 'patch-31' into 'master'Evan Read
fix typos in new_ci_build_permissions_model.md See merge request gitlab-org/gitlab-ce!28087
2019-05-12Merge branch 'updateWebhooksIssueMR' into 'master'Achilleas Pipinellis
Update webhooks examples of Issue and MR in documentation Closes #61187 See merge request gitlab-org/gitlab-ce!27897
2019-05-12update `updated_at`field tooManeschi Romain
Not my initial idea but when I write the issue I see this field is wrong
2019-05-12Resolve CE/EE diffs in app/views/layouts viewLuke Bennett
Part of single codebase changes.
2019-05-12Resolve CE/EE diffs in health checkLuke Bennett
Part of single codebase changes.
2019-05-11Merge branch 'docs-k8s-apps-architecture-overview' into 'master'Achilleas Pipinellis
Update K8S apps to checkmark See merge request gitlab-org/gitlab-ce!28259
2019-05-11Resolve CE/EE diffs in zero_authorized_projectsLuke Bennett
Part of single codebase changes.
2019-05-11Resolve CE/EE diffs in project branchesLuke Bennett
Part of single codebase changes.
2019-05-11Merge branch 'include-ee-fixtures' into 'master'12-0-auto-deploy-0009646Stan Hu
Add EE fixtures to SeedFu fixture paths See merge request gitlab-org/gitlab-ce!28241
2019-05-11Merge branch 'sh-update-process-mem' into 'master'Ash McKenzie
Update get_process_mem to 0.2.3 See merge request gitlab-org/gitlab-ce!28248
2019-05-11Update K8S apps to checkmarkMatija Čupić
2019-05-11Couple of improvements to the Vuex frontend guidePhillip Johnsen
Two nitpick improvements to the following: * set `state.isAddingUser = false` when request resulted in an error, as it has finished after all * be very explicit about vuex store being a local module to avoid confusion about a dependency named `store`
2019-05-11Resolve CE/EE diffs in new proj member importLuke Bennett
Part of single codebase changes.
2019-05-11Merge branch 'winh-frontend-test-waiting-docs' into 'master'Mike Lewis
Provide alternatives to using setTimeout in frontend tests (docs) Closes #49612 See merge request gitlab-org/gitlab-ce!28207
2019-05-11Merge branch 'sh-add-omnibus-secrets' into 'master'Grzegorz Bizon
Add warning about updating Omnibus is secrets are updated See merge request gitlab-org/gitlab-ce!28247
2019-05-11Merge branch '61550-next-badge' into 'master'Phil Hughes
Fixes next badge being always visible Closes #61550 See merge request gitlab-org/gitlab-ce!28249
2019-05-11Resolve CE/EE diffs in devise ldap tabsLuke Bennett
Part of single codebase changes.
2019-05-10Fixes next badge being always visibleFilipa Lacerda
2019-05-10Update get_process_mem to 0.2.3Stan Hu
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
2019-05-10Add warning about updating Omnibus is secrets are updatedStan Hu
[ci skip]
2019-05-10Fixes issues with show whitespace button in diffsPhil Hughes
Correctly updates the URL without overwriting parameters Reloads the diff file content without reloading the page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58852, https://gitlab.com/gitlab-org/gitlab-ce/issues/42597
2019-05-10Eager load the GraphQL schema in specsBob Van Landuyt
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.
2019-05-10Merge branch 'avoid-unrelated-errors-in-quarantined-specs' into 'master'Lin Jen-Shin
Fix unrelated errors when teardowning quanrantined specs See merge request gitlab-org/gitlab-ce!28240
2019-05-10Merge branch 'update-ci-minutes-doc' into 'master'Achilleas Pipinellis
Update CI minutes docs to reflect this is available to all plans See merge request gitlab-org/gitlab-ce!28237
2019-05-10Update CI minutes docs to reflect this is available to all plansJames Lopez
2019-05-10Add EE fixtures to SeedFu pathBalasankar "Balu" C
Signed-off-by: Balasankar "Balu" C <balasankar@gitlab.com>
2019-05-10Merge branch 'sh-fix-lfs-download-errors' into 'master'Douglas Barbosa Alexandre
Properly handle LFS Batch API response in project import Closes #61624 See merge request gitlab-org/gitlab-ce!28223
2019-05-10Remove ignore_column from Project modelDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2019-05-10Merge branch 'winh-simplify-frontend-fixtures' into 'master'Rémy Coutable
Simplify frontend test fixtures See merge request gitlab-org/gitlab-ce!27531
2019-05-10Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600Rémy Coutable
Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass" Closes #60180 See merge request gitlab-org/gitlab-ce!28206
2019-05-10Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs
2019-05-10Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable
Don't run full gc in AfterImportService Closes gitlab-ee#11556 See merge request gitlab-org/gitlab-ce!28239
2019-05-10Fix unrelated errors when teardowning quanrantined specsRémy Coutable
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>
2019-05-10Remove trailing empty linesWinnie Hellmann
2019-05-10Remove unused fixture_file_name parametersWinnie Hellmann
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
2019-05-10Remove example block parametersWinnie Hellmann
for f in $(find spec/javascripts/fixtures/ -name '*.rb') do sed 's/do |example|/do/' < $f > $f.tmp; mv $f.tmp $f done
2019-05-10Remove duplicate store_frontend_fixture() callsWinnie Hellmann
for f in $(find spec/javascripts/fixtures/ -name '*.rb') do grep -v store_frontend_fixture < $f > $f.tmp; mv $f.tmp $f done
2019-05-10Merge balsamiq fixture into raw file fixturesWinnie Hellmann
2019-05-10Merge PDF fixture into raw file fixturesWinnie Hellmann
2019-05-10Expose response variable for raw file fixturesWinnie Hellmann