summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Correctly translate all forms in testsbvl-i18n-validationBob Van Landuyt2018-06-153-20/+65
|
* Validate PO-variable usage in message idsBob Van Landuyt2018-06-151-0/+22
| | | | | That way we can detect incorrect usage before the strings are added to Crowdin for translation
* Forbids combining named and unnamed variables in `gitlab.pot`Bob Van Landuyt2018-06-151-40/+62
| | | | | This would break with an argument error when interpolating using `sprintf` in ruby.
* Merge branch 'fix-rails5-nagative-enum-spec' into 'master'Kamil Trzciński2018-06-151-8/+0
|\ | | | | | | | | | | | | Fix "[Rails5] '-1' is not a valid data_store" Closes #47369 See merge request gitlab-org/gitlab-ce!19882
| * Remove unexpected data store test suitefix-rails5-nagative-enum-specShinya Maeda2018-06-151-8/+0
| |
| * Fix "[Rails5] '-1' is not a valid data_store"Shinya Maeda2018-06-151-1/+1
| |
* | Merge branch 'ide-add-last-commit-id-to-api-call' into 'master'Douwe Maan2018-06-152-71/+84
|\ \ | | | | | | | | | | | | | | | | | | IDE sends last commit ID when committing changes Closes #46192 See merge request gitlab-org/gitlab-ce!19552
| * | only return last_commit_sha in the JSONide-add-last-commit-id-to-api-callPhil Hughes2018-06-152-9/+3
| | |
| * | IDE sends last commit ID when committing changesPhil Hughes2018-06-152-71/+90
| | | | | | | | | | | | Closes #46192
* | | Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master'Kamil Trzciński2018-06-151-0/+25
|\ \ \ | |/ / |/| | | | | | | | [CE backport] Backport InternalRedirect#sanitize_redirect See merge request gitlab-org/gitlab-ce!19795
| * | Backport InternalRedirect#sanitize_redirectce-jej/sanitize-group-saml-relay-stateJames Edwards-Jones2018-06-141-0/+25
| | |
* | | Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' ↵Douwe Maan2018-06-151-0/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Make the html attribute on the blob json call optional" Closes #46668 See merge request gitlab-org/gitlab-ce!19479
| * | | Reuse viewer param and move logic to blob controllerDouwe Maan2018-06-151-2/+3
| | | |
| * | | Changed the query string parameter to a string46668-make-the-html-attribute-on-the-blob-json-call-optionalTim Zallmann2018-06-151-1/+1
| | | |
| * | | Fixed linting error with trailing space in rbTim Zallmann2018-06-141-1/+1
| | | |
| * | | Makes the html attribute in the json output optional with the option ↵Tim Zallmann2018-06-141-0/+18
| | | | | | | | | | | | | | | | html_render=false
* | | | Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master'Rémy Coutable2018-06-151-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive remove deploy key spec See merge request gitlab-org/gitlab-ce!19800
| * | | | Fix flakey time-sensitive remove deploy key specfix-flakey-remove-deploy-key-specEric Eastwood2018-06-141-1/+2
| | | | |
* | | | | Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into ↵Douwe Maan2018-06-151-25/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix flakey time-sensitive user/assignee autocomplete dropdown See merge request gitlab-org/gitlab-ce!19799
| * | | | Update dropdown_assignee_spec with filtered_search_helpersfix-flakey-user-assignee-autocomplete-dropdown-specsEric Eastwood2018-06-141-19/+18
| | | | |
| * | | | Fix flakey user/assignee autocomplete dropdownEric Eastwood2018-06-141-8/+10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/38664 This previously worked because, it would assert the correct names in the full list and then wait for the list to go blank for the NOT assertion Example failure, https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/74649299
* | | | Resolve ""Click to expand" link in collapsed diffs should be blue"Annabel Gray2018-06-141-2/+1
| | | |
* | | | Resolve "Placeholder note renders the user name in a new line"Clement Ho2018-06-141-2/+2
| | | |
* | | | Resolve "Performance bar Gitaly modal is hard to read"Annabel Gray2018-06-141-0/+8
| | | |
* | | | Merge branch 'ide-pipeline-reset-state' into 'master'Filipa Lacerda2018-06-143-6/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resets state correctly when switching to merge request in IDE Closes #47763 See merge request gitlab-org/gitlab-ce!19707
| * | | | Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-133-6/+35
| | | | | | | | | | | | | | | | | | | | Closes #47763
* | | | | Merge branch 'ce-6420-unify-spec_helper.rb' into 'master'Nick Thomas2018-06-141-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | CE: Resolve "Extract EE specific files/lines for spec/spec_helper.rb" See merge request gitlab-org/gitlab-ce!19851
| * | | | | Port route helper from EE to CELin Jen-Shin2018-06-141-0/+1
| | | | | |
* | | | | | Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-143-7/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix table_exists? to be Rails5 compatible Closes #45107 See merge request gitlab-org/gitlab-ce!19418
| * | | | | Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-143-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | Use data_source_exists? where possible instead of table_exists? in order to be Rails5 compatible
* | | | | | Merge branch 'unify-image_lazy_load_filter_spec.rb' into 'master'Rémy Coutable2018-06-141-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unify spec/lib/banzai/filter/image_lazy_load_filter_spec.rb See merge request gitlab-org/gitlab-ce!19836
| * | | | | | We don't need to pass lib: true as in EEunify-image_lazy_load_filter_spec.rbLin Jen-Shin2018-06-141-1/+1
| | | | | | |
* | | | | | | Merge branch 'zj-mandatory-batch' into 'master'Sean McGivern2018-06-143-159/+47
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Gitaly RPCs to mandatory Closes gitaly#217, gitaly#389, gitaly#390, gitaly#220, gitaly#376, and gitaly#354 See merge request gitlab-org/gitlab-ce!19759
| * | | | | | HasLocalBranches check is done by Gitaly onlyZeger-Jan van de Weg2018-06-141-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/217
| * | | | | | Branches are fully migrated to GitalyZeger-Jan van de Weg2018-06-141-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes: https://gitlab.com/gitlab-org/gitaly/issues/389
| * | | | | | Default branch detection happens through GitalyZeger-Jan van de Weg2018-06-141-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration: https://gitlab.com/gitlab-org/gitaly/issues/220
| * | | | | | RawBlame only called through GitalyZeger-Jan van de Weg2018-06-131-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/376
| * | | | | | Move GC RPCs to mandatoryZeger-Jan van de Weg2018-06-131-72/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitaly/issues/354
* | | | | | | Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-1412-18/+54
| | | | | | |
* | | | | | | Merge branch 'fix-flakey-user-comment-on-issue' into 'master'Sean McGivern2018-06-141-2/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786
| * | | | | | Fix flakey user comment on issue test race conditionEric Eastwood2018-06-141-2/+5
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch ↵Sean McGivern2018-06-141-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774
| * | | | | | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated.
* | | | | | | Merge branch 'jprovazn-rails5-shoulda' into 'master'Rémy Coutable2018-06-141-0/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix shoulda-matchers in Rails 5 Closes #47639 See merge request gitlab-org/gitlab-ce!19749
| * | | | | | | Fix shoulda-matchers in Rails 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
* | | | | | | | enable CommonMark as the defaultBrett Walker2018-06-148-31/+106
| | | | | | | |
* | | | | | | | Merge branch 'rails5-fix-47805' into 'master'Rémy Coutable2018-06-141-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is… Closes #47805 See merge request gitlab-org/gitlab-ce!19763
| * | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is ↵Jasper Maes2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty: application_setting
* | | | | | | | | Merge branch 'rails5-fix-47804' into 'master'Rémy Coutable2018-06-141-4/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix stack level too deep Closes #47804 See merge request gitlab-org/gitlab-ce!19762
| * | | | | | | | Rails5 fix stack level too deepJasper Maes2018-06-131-4/+4
| |/ / / / / / /