summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Use Process::Status rather than an integerLin Jen-Shin2018-01-262-9/+9
| | | | However keep backward compatibility
* Eliminate the warnings from task helpersLin Jen-Shin2018-01-261-1/+0
|
* Fail static-analysis if there's output to stderrLin Jen-Shin2018-01-263-3/+153
| | | | TODO: fix offenders
* Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-261-0/+10
|\ | | | | | | | | Make sure that axios adapater is restored after mocking See merge request gitlab-org/gitlab-ce!16660
| * Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-251-0/+10
| |
* | Fix rubocop offenses introduced in !16623Ahmad Sherif2018-01-251-2/+7
| |
* | Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'Robert Speicher2018-01-251-0/+36
|\ \ | | | | | | | | | | | | | | | | | | Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
| * | Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitalyAhmad Sherif2018-01-241-0/+36
| | | | | | | | | | | | Closes gitaly#946
* | | Merge branch 'move-users-spinach-tests-to-rspec' into 'master'Robert Speicher2018-01-251-0/+107
|\ \ \ | | | | | | | | | | | | | | | | Move user page spinach tests to RSpec See merge request gitlab-org/gitlab-ce!16598
| * | | Move user page spinach tests to RSpecSemyon Pupkov2018-01-251-0/+107
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* | | | Merge branch 'lint-rugged' into 'master'Rémy Coutable2018-01-252-21/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
| * | | | Look for rugged with static analysislint-ruggedJacob Vosmaer2018-01-252-21/+13
| | | | |
* | | | | Merge branch '40028-special-characters-on-issuable-templates' into 'master'Rémy Coutable2018-01-251-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handling special characters in Issuable Templates Closes #40028 See merge request gitlab-org/gitlab-ce!15323
| * | | | | Handle special characters on API request of issuable templatesTakuya Noguchi2018-01-251-2/+2
| | | | | |
* | | | | | Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'Filipa Lacerda2018-01-251-14/+96
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update secret_values to support dynamic elements within parent See merge request gitlab-org/gitlab-ce!16665
| * | | | | | Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elementsEric Eastwood2018-01-241-14/+96
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110 which introduces a dynamic variable list and needs secrets. We use the valueSelector/placeholderSelector options to avoid selecting the last empty row.
* | | | | | Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'Grzegorz Bizon2018-01-251-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix .batch_lfs_pointers accepting a lazy enumerator See merge request gitlab-org/gitlab-ce!16701
| * | | | | | Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-0/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'Rémy Coutable2018-01-251-2/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
| * | | | | Look at notes created just before merge when deciding if an MR can be revertedNick Thomas2018-01-251-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created *after* the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
* | | | | | Merge branch 'default-to-https-for-gravatar-urls' into 'master'Rémy Coutable2018-01-2511-50/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to HTTPS for all Gravatar URLs See merge request gitlab-org/gitlab-ce!16666
| * | | | | | Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urlsAchilleas Pipinellis2018-01-2511-50/+50
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
* | | | | | Merge branch 'fl-more-mr-widget' into 'master'Phil Hughes2018-01-253-33/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves status icon into a vue file and adds tests See merge request gitlab-org/gitlab-ce!16703
| * | | | | | Update missing pathsfl-more-mr-widgetFilipa Lacerda2018-01-251-2/+2
| | | | | | |
| * | | | | | Merge branch 'master' into fl-more-mr-widgetFilipa Lacerda2018-01-2544-235/+511
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (30 commits) Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Migrate repository bundling to Gitaly Use limit for search count queries Fix offense in runners settings QA page object class Wait for runner until it registers itself in QA tests Fix static-analysis offenses in QA support class Add specific views / selectors for QA runners page Add views / selectors for pipeline show page object ...
| * | | | | | Moves status icon into a vue file and adds testsFilipa Lacerda2018-01-243-33/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves merging component into a vue file, adds i18n and better test cases
* | | | | | | Merge branch 'winh-delete-milestone-modal' into 'master'Phil Hughes2018-01-251-0/+95
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modal for deleting a milestone Closes #41314 See merge request gitlab-org/gitlab-ce!16229
| * | | | | | | Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-251-0/+95
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'revert-430b3f0e' into 'master'Douwe Maan2018-01-251-0/+38
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'remove-rugged-walk' into 'master'" See merge request gitlab-org/gitlab-ce!16676
| * | | | | | | Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-0/+38
| |/ / / / / / | | | | | | | | | | | | | | This reverts merge request !16525
* | | | | | | Merge branch 'jej/gitattributes-check-at-ref' into 'master'Rémy Coutable2018-01-254-26/+100
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
| * | | | | | Can parse root .gitattributes file for a refjej/gitattributes-check-at-refJames Edwards-Jones2018-01-244-26/+100
| | | | | | |
* | | | | | | Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-4/+4
| | | | | | |
* | | | | | | Merge branch ↵Rémy Coutable2018-01-251-0/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
| * | | | | | | Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when counting commit count.
* | | | | | | | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-253-153/+127
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16677
| * | | | | | | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Adds i18n Adds better test coverage
* | | | | | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-243-0/+123
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will enable Geo to skip shards that not operational. Relates to gitlab-org/gitlab-ee#4329
* | | | | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * | | | | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Related to #39805
* | | | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-242-1/+59
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * | | | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-232-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | | | | | | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-2428-61/+85
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Closes #30783 See merge request gitlab-org/gitlab-ce!16516
| * | | | | | | Avoid array indices to fixtures in JS specsNick Thomas2018-01-243-8/+11
| | | | | | | |
| * | | | | | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQLNick Thomas2018-01-241-0/+15
| | | | | | | |
| * | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-2428-62/+68
| | | | | | | |
* | | | | | | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'Robert Speicher2018-01-241-15/+28
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate .batch_lfs_pointers to Gitaly Closes gitaly#921 See merge request gitlab-org/gitlab-ce!16517
| * | | | | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-241-15/+28
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes gitaly#921
* | | | | | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-242-1/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Execute system hooks after-commit when executing project hooks See merge request gitlab-org/gitlab-ce!16673
| * | | | | | | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-242-1/+20
| | |_|/ / / / | |/| | | | |