diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 11:37:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-05 11:37:06 +0000 |
| commit | f0c4fbea1c0621a6c5c12e9c9dd5eb534ee58157 (patch) | |
| tree | c6dcad3a1f49194f741d24bc3de3581b59d34b2c /spec/features | |
| parent | 2cf2df8ea07703852247fdfbde73113d585aeb3d (diff) | |
| parent | 96ef3e70383082f881c437754031e7c219eb50e1 (diff) | |
| download | gitlab-ce-f0c4fbea1c0621a6c5c12e9c9dd5eb534ee58157.tar.gz | |
Merge branch 'master' into 22643-manual-job-page
* master: (24 commits)
Allow local tests to use a modified Gitaly
Update check.md
add deprecation and removal issue to docs
Add status attribute to runner api entity
Fix typos in a code comment
Just try to detect and assign once
Modify `LDAP::Person` to return username value based on attributes
Create Kubernetes based on Application Templates
Fix a bug where charlock_holmes was used needlessly to encode strings
Ignore the Migration/Datetime cop in a migration that fix a column type to datetime_with_timezone
Use `__` instead of `s__` when context is not required
Enclose props in quotes
Update some Gitaly annotations in Gitlab::Shell
Prepare Gitlab::Git::Repository#rebase for Gitaly migration
add missing changelog
refactor spec, add docs
deprecate check integrity task
add lock specs
add locks chek
remove max-depth flag so it works with subgroups
...
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/projects/import_export/export_file_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb index 461aa39d0ad..6732cf61767 100644 --- a/spec/features/projects/import_export/export_file_spec.rb +++ b/spec/features/projects/import_export/export_file_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' # Integration test that exports a file using the Import/Export feature # It looks up for any sensitive word inside the JSON, so if a sensitive word is found -# we''l have to either include it adding the model that includes it to the +safe_list+ +# we'll have to either include it adding the model that includes it to the +safe_list+ # or make sure the attribute is blacklisted in the +import_export.yml+ configuration feature 'Import/Export - project export integration test', :js do include Select2Helper |