Commit Graph

1070 Commits

Author SHA1 Message Date
Kamil Trzciński e00e62c2c8 Merge branch 'backstage/gb/migrate-stages-statuses' into 'master'
Migrate CI/CD stages statuses

Closes #33453

See merge request !12584
2017-08-21 11:47:44 +00:00
Sean McGivern c3e0f31dfb Merge branch 'backstage/gb/migrations-tests-schema-version' into 'master'
Improve migrations / background migrations testing strategy

Closes #36303

See merge request !13589
2017-08-17 11:54:54 +00:00
Grzegorz Bizon 3a29646d73 Disable migrations output in migrations helpers 2017-08-17 12:34:31 +02:00
Grzegorz Bizon d1cfa79dfc Merge branch 'backstage/gb/migrations-tests-schema-version' into backstage/gb/migrate-stages-statuses
* backstage/gb/migrations-tests-schema-version:
  Migrate down before each migration unit test
  Disable db_cleaner tables caching in migrations tests
  Extend migrations testing documentation
  Make it possible to provide schema version in tests
  Migrate db schema for context in :migration specs
2017-08-17 11:59:00 +02:00
Rémy Coutable 4e0ee10a72 Merge branch 'bvl-circuitbreaker-settings-to-avoid-failures' into 'master'
Circuitbreaker settings to avoid spec-failures

Closes #36324

See merge request !13519
2017-08-16 13:38:00 +00:00
Bob Van Landuyt ee603a0089 Allow a `failure_wait_time` of 0 for storage access
This allows testing every storage attempt after a failure. Which could
be useful for tests
2017-08-16 14:15:50 +02:00
Clement Ho b84d6efa26 Change find to within for detecting bad search specs 2017-08-16 12:11:35 +00:00
Grzegorz Bizon d90b0f8c99 Disable db_cleaner tables caching in migrations tests 2017-08-16 14:07:17 +02:00
Grzegorz Bizon 32d0983a4e Merge branch 'master' into backstage/gb/migrate-stages-statuses
* master: (1000 commits)
  Fix username autocomplete group name with no avatar alignment
  Fix 'Projected tags' typo in protected_tags_spec.rb
  Many Repo Fixes
  Repo Editor Fixes
  Docs: New index for permissions
  link article from CI index
  link tech articles from the landing page
  new articles come first
  fix relative link
  fix date format
  Fixed changed files dropdown not being shown
  Update publication date
  Remove deprecated field from workhorse API responses
  Fix API responses when dealing with txt files
  Make sure MySQL would not use CURRENT_TIMESTAMP
  Add two more project templates
  Allow usage of any_projects? with an Array
  Copyedit Artifactory and GitLab article
  Rename Artifactory and GitLab article file
  Display GPG status loading spinner only when Ajax request is made
  ...
2017-08-16 13:18:03 +02:00
Grzegorz Bizon c76f8f3e8f Make it possible to provide schema version in tests 2017-08-16 13:05:18 +02:00
Grzegorz Bizon 7156497493 Migrate db schema for context in :migration specs 2017-08-16 12:49:06 +02:00
Robert Speicher 4edfad9678 Enable Layout/TrailingWhitespace cop and auto-correct offenses 2017-08-15 13:44:37 -04:00
Douwe Maan 0da644072f Merge branch 'malformed-submodule' into 'master'
Handle missing .gitmodules when getting submodule urls

See merge request !13509
2017-08-15 09:00:44 +00:00
Winnie Hellmann d2b4109b08 Display GPG status loading spinner only when Ajax request is made 2017-08-15 08:20:35 +00:00
Clement Ho cf55fb9b96 Merge branch '34527-make-edit-comment-button-always-available-outside-of-dropdown' into 'master'
Resolve "Make edit comment button always available outside of dropdown"

Closes #34527

See merge request !12931
2017-08-14 17:08:28 +00:00
Jacob Vosmaer d9b6fd4fba Handle missing .gitmodules when getting submodule urls 2017-08-14 10:53:02 +02:00
Lin Jen-Shin 3b0dcbf235 Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better
* upstream/master:
  Fix merge request diff deserialisation when too_large was absent
  Bumps omniauth-ldap gem version to 2.0.4
  Remove an unnecessary `let` in spec/features/projects/user_edits_files_spec.rb
  Remove documentation about rules that are now enforced by RuboCop
  Enable the RSpec/HookArgument cop and auto-correct offenses
2017-08-11 20:30:14 +08:00
Lin Jen-Shin e04c1ae7c7 Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-better
* upstream/master: (62 commits)
  Update gitlab.po: Missing 'r' in "Fouché" that comes from "Fourcher" verb.
  Docs: update user docs index
  Fix minor typos in views
  Fix Layout/SpaceBeforeBlockBraces violation in bin/changelog_spec
  Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'
  Merge branch 'import-symlinks-9-3' into 'security-9-3'
  Fix wrong method call on prometheus histogram
  Document new all-in-one Helm chart - docs
  Fix 404 on link path
  Fix line numbers not matching up to code in code viewer.
  Hide overflow-x on collapsed sidebar
  removed global use of breakpoint checker
  Increase performance of the breakpoint size checker
  Filter sensitive query string parameters from NGINX access logs
  Added a template for database changes
  Render new issue link in failed job as a regular link instead of a UJS one
  Include RE2 in the upgrade docs
  Remove affix plugin from issuable sidebar with new navigation
  Fix linter error
  alternative route for download archive
  ...
2017-08-11 19:15:35 +08:00
Robert Speicher c8b802471b Enable the RSpec/HookArgument cop and auto-correct offenses 2017-08-10 19:29:42 -04:00
Simon Knox 8858ddaf83 take edit note button out of dropdown 2017-08-10 09:37:25 +10:00
Robert Speicher 420d835e5f Merge branch '36003-do-not-include-to-kernel' into 'master'
Don't include anything to Kernel only because of tasks

Closes #36003

See merge request !13380
2017-08-09 16:35:33 +00:00
Robert Speicher a0fa59f61e Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'
Enable the Layout/SpaceBeforeBlockBraces cop

See merge request !13413
2017-08-09 16:02:04 +00:00
Lin Jen-Shin 412db1874f Fix some tests and report the error message 2017-08-09 21:41:45 +08:00
Bob Van Landuyt 016522dd5f Add a helper to stub storage settings with defaults 2017-08-09 11:56:14 +02:00
Rémy Coutable c946ee1282
Enable the Layout/SpaceBeforeBlockBraces cop
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-09 11:52:22 +02:00
Lin Jen-Shin 77f10d55de Properly set the expectation on the main object 2017-08-09 01:43:33 +08:00
Lin Jen-Shin d831e8e1d0 Add a test to show that threshold 40 would corrupt
If we set `ENCODING_CONFIDENCE_THRESHOLD` to 40,
this test case would not pass. If we raise to 50,
this would pass.

Note that if in the future rugged didn't return
corrupt data, this would be less relevant. But still
icu recommend the threshold to be 50, we should just
stick with 50.
2017-08-08 19:10:46 +08:00
Rémy Coutable feb8974cc8 Merge branch '35941-fix-testing-issue-following-gitaly-install-fix' into 'master'
Unset the `RUBYOPT` env variable before installing `gitaly-ruby`

Closes #35941 and #35967

See merge request !13313
2017-08-08 09:39:49 +00:00
Sean McGivern c94990820a Merge branch '32844-issuables-performance' into 'master'
Issuables: Move some code from create services to Sidekiq workers

See merge request !13326
2017-08-07 21:21:29 +00:00
Robert Speicher 4e2b630df7 Merge branch 'group-milestone-references-system-notes' into 'master'
Support group milestone references

Closes #34778

See merge request !13289
2017-08-07 19:22:41 +00:00
Sean McGivern 33bcfbf8e3 Merge branch '36052-reset-only-migration-models' into 'master'
Reset only migration models

Closes #36052

See merge request !13336
2017-08-07 18:20:18 +00:00
Sean McGivern 5bf65c9306 Merge branch 'bvl-nfs-circuitbreaker' into 'master'
Circuitbreaker for storage paths

Closes #32207, #33117, gitlab-com/infrastructure#1946, and gitlab-com/infrastructure#1775

See merge request !11449
2017-08-07 14:56:15 +00:00
Jarka Kadlecova 9ef3c431e4 Move some after_create parts to worker to improve performance 2017-08-07 15:57:56 +02:00
Lin Jen-Shin 4d7c072da3 Reset only migration models
So that we could make sure migration tests could run even if
geo is not setup in EE.

This is because we have a model like this:

``` ruby
class Geo::BaseRegistry < ActiveRecord::Base
  def self.connection
    raise 'Geo secondary database is not configured' unless Gitlab::Geo.geo_database_configured?

    super
  end
end
```
2017-08-07 21:20:26 +08:00
Mehdi Lahmam 5ad9d94d8e Add `/assign me` alias support for assigning issuables to oneself
Currently, when a user wants to assign an issue/MR to himself, he needs
to type his full username or select it from the suggested ones in the
dropdown list.
This commits suggest a faster solution which is typing `/assign me`

Closes #35304.
2017-08-07 14:40:33 +02:00
Sean McGivern ca923d4899 Create system notes for group milestone changes 2017-08-07 11:55:00 +01:00
Sean McGivern 149528f472 Support references to group milestones
Group milestones can only be referred to by name, not IID. They also do not
support cross-project references.
2017-08-07 11:55:00 +01:00
Douwe Maan 727b6d16e5 Merge branch 'master' into 'bvl-nfs-circuitbreaker'
# Conflicts:
#   app/models/repository.rb
#   spec/models/repository_spec.rb
2017-08-07 09:13:10 +00:00
Rémy Coutable 5df9283f29 Merge branch '2902-standalone-ee-dir-ce' into 'master'
CE: Move EE-specific files to a standalone directory

Closes gitlab-ee#3097

See merge request !13311
2017-08-04 16:15:03 +00:00
Rémy Coutable 450fa60f48 Merge branch 'revert-6291bc8c' into 'master'
Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"

See merge request !13292
2017-08-04 16:13:48 +00:00
Rémy Coutable 21937a157d
Print the setup steps and duration and fix an issue resulting in re-setuping GitLab Shell on each test run
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 17:27:50 +02:00
Rémy Coutable 201ce2cb55
Unset the RUBYOPT env variable before installing gitaly-ruby
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-04 16:10:52 +02:00
Rémy Coutable 805a28e6a1 Revert "Merge branch 'fix-gitaly-install' into 'master'"
This reverts commit 23c502b434, reversing
changes made to 1018ab0516.
2017-08-04 15:59:30 +02:00
Lin Jen-Shin b7547ade67 Backport to CE for:
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
2017-08-04 21:45:14 +08:00
Bob Van Landuyt 3598e60bf2 Add a Circuitbreaker for storage paths 2017-08-04 15:38:48 +02:00
Rémy Coutable 8fff6a3422 Merge branch 'rs-issue-35701' into 'master'
Ensure DeviseHelpers is loaded before inclusion in LoginHelpers

Closes #35701

See merge request !13261
2017-08-04 13:33:58 +00:00
Robert Speicher b9075d22d7 Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"
This reverts merge request !12761
2017-08-03 19:21:43 +00:00
Robert Speicher f7a61c4a44 Ensure DeviseHelpers is loaded before inclusion in LoginHelpers 2017-08-03 10:47:11 -04:00
Lin Jen-Shin bb5f79d43e Don't include EmailHelpers manually, pick with rspec
`:mailer` is needed to pick it easily, while
`type: :mailer` is needed for picking it automatically for
tests located in spec/mailers/*_spec.rb

It's a bit complicated in spec/services/notification_service_spec.rb
but we'll leave it alone for now.
2017-08-03 21:55:48 +08:00
Rémy Coutable 23c502b434 Merge branch 'fix-gitaly-install' into 'master'
Ensure we run installation Rake tasks in a clean env in TestEnv

Closes #35859

See merge request !13249
2017-08-03 11:36:41 +00:00