summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Avoid leaving a push event empty if payload cannot be createdsh-validate-path-project-importStan Hu2018-01-031-2/+12
| | | | | | | | If the payload cannot be created for some reason, we could be left with a nil push event payload, which causes Error 500s when viewing the dashboard. Guard against this error and log when it happens. Avoids problems seen in #38823
* Merge branch 'sh-optimize-commit-stats' into 'master'Robert Speicher2018-01-031-0/+5
|\ | | | | | | | | Speed up generation of commit stats by using Rugged native methods See merge request gitlab-org/gitlab-ce!16186
| * Speed up generation of commit stats by using Rugged native methodssh-optimize-commit-statsStan Hu2018-01-021-0/+5
| | | | | | | | | | | | | | | | | | | | The previous implementation iterated across the entire patch set to determine the number of lines added, deleted, and changed. Rugged has a native method `Rugged::Diff#stat` that does this already, which appears to be a little faster and require less RAM than doing this ourselves. Improves performance in #41524
* | Merge branch 'migrate-fork-repo-to-gitaly' into 'master'Robert Speicher2018-01-031-23/+49
|\ \ | | | | | | | | | | | | | | | | | | Migrate repo forking to Gitaly Closes gitaly#825 See merge request gitlab-org/gitlab-ce!16018
| * | Migrate repo forking to Gitalymigrate-fork-repo-to-gitalyAhmad Sherif2018-01-021-23/+49
| | | | | | | | | | | | Closes gitaly#825
* | | Merge branch '41424-gitlab-rake-gitlab-import-repos-schedules-an-import' ↵Douwe Maan2018-01-031-0/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "gitlab-rake gitlab:import:repos schedules an import" Closes #41424 See merge request gitlab-org/gitlab-ce!16115
| * | | refactor code to use new import typeJames Lopez2018-01-031-1/+1
| | | |
| * | | fix wiki checkJames Lopez2018-01-021-0/+1
| | | |
| * | | add extra spec checkJames Lopez2018-01-021-1/+2
| | | |
| * | | Fix import scheduled on bare repo importJames Lopez2018-01-021-0/+8
| | |/ | |/|
* | | Merge branch 'jprovazn-search-issues' into 'master'Sean McGivern2018-01-031-7/+28
|\ \ \ | | | | | | | | | | | | | | | | Skip projects filter on issues search See merge request gitlab-org/gitlab-ce!16117
| * | | Skip projects filter on issues searchjprovazn-search-issuesJan Provaznik2018-01-021-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for issues, an additional subquery is added which filters only issues in a project. If global context is used (no project is specified) this query filters all projects user has access to. In that case we can skip this filter because filtering only projects user has access to is added anyway. The filter is used only if a custom project context is specified Related to #40540
* | | | Merge branch 'gitaly-conflict-resolver' into 'master'Grzegorz Bizon2018-01-031-0/+90
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly conflict resolver Closes gitaly#813 See merge request gitlab-org/gitlab-ce!15755
| * | | | Simplify conflict resolution interface and codegitaly-conflict-resolverAlejandro Rodríguez2018-01-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
| * | | | Incorporate ConflictsService.ResolveConflicts Gitaly RPCAlejandro Rodríguez2017-12-271-7/+36
| | | | |
| * | | | Incorporate ConflictsService.ListConflictFiles Gitaly RPCAlejandro Rodríguez2017-12-271-0/+58
| | |_|/ | |/| |
* | | | Merge branch 'bvl-fork-public-project-to-private-namespace' into 'master'Douwe Maan2018-01-021-0/+27
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Forking a project to a namespace with lower visibility Closes #40022 See merge request gitlab-org/gitlab-ce!16050
| * | | Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespaceBob Van Landuyt2017-12-291-0/+27
| |/ / | | | | | | | | | | | | | | | | | | In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
* | | Merge branch 'gitaly-encoding-helpers' into 'master'Grzegorz Bizon2017-12-292-14/+14
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Move encoding methods to the more general EncodingHelper Closes gitaly#847 See merge request gitlab-org/gitlab-ce!16137
| * | Move encoding methods to the more general EncodingHelpergitaly-encoding-helpersAlejandro Rodríguez2017-12-282-14/+14
| | |
* | | Merge branch 'sh-handle-anonymous-clones-project-moved' into 'master'Grzegorz Bizon2017-12-261-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500s with anonymous clones for a project that has moved Closes #41457 See merge request gitlab-org/gitlab-ce!16128
| * | | Disable redirect messages for anonymous clonessh-handle-anonymous-clones-project-movedStan Hu2017-12-251-2/+1
| | | |
| * | | Fix Error 500s with anonymous clones for a project that has movedStan Hu2017-12-251-0/+7
| | | | | | | | | | | | | | | | Closes #41457
* | | | Merge branch 'sh-catch-invalid-uri-markdown' into 'master'Robert Speicher2017-12-251-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Gracefully handle garbled URIs in Markdown Closes #41442 See merge request gitlab-org/gitlab-ce!16123
| * | | Gracefully handle garbled URIs in Markdownsh-catch-invalid-uri-markdownStan Hu2017-12-221-0/+5
| |/ / | | | | | | | | | | | | | | | | | | There are certain inputs that look like valid URIs that are accepted by URI but not Addressable::URI. Handle the case where the latter fails. Closes #41442
* | | Merge branch 'gitaly-remotes' into 'master'Dmitriy Zaporozhets2017-12-252-15/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService RPCs Closes gitaly#852 See merge request gitlab-org/gitlab-ce!16060
| * | | Incorporate Gitaly's RemoteService RPCsgitaly-remotesAlejandro Rodríguez2017-12-222-0/+90
| | | |
| * | | Remove unused method `remote_exists?`Alejandro Rodríguez2017-12-221-15/+0
| | | |
* | | | Merge branch '36782-replace-team-user-role-with-add_role-user-in-specs' into ↵Rémy Coutable2017-12-2329-76/+76
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Replace '.team << [user, role]' with 'add_role(user)' in specs" Closes #36782 See merge request gitlab-org/gitlab-ce!16069
| * | | Replace '.team << [user, role]' with 'add_role(user)' in specs36782-replace-team-user-role-with-add_role-user-in-specsblackst0ne2017-12-2229-76/+76
| | |/ | |/|
* | | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-223-40/+206
| | |
* | | Use relative URLs when linking to uploaded filesNick Thomas2017-12-222-133/+81
|/ /
* | Merge branch 'jprovazn-search' into 'master'Yorick Peterse2017-12-211-0/+11
|\ \ | | | | | | | | | | | | Skip projects filter on merge requests search See merge request gitlab-org/gitlab-ce!15955
| * | Skip projects filter on merge requests searchjprovazn-searchJan Provaznik2017-12-211-0/+11
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
* | Merge branch 'pawel/reduce_cardinality_of_prometheus_metrics' into 'master'Douwe Maan2017-12-212-8/+11
|\ \ | |/ |/| | | | | | | | | Reduce cardinality of some of GitLab's Prometheus metrics and fix observed duration reporting. Closes #41045 See merge request gitlab-org/gitlab-ce!15881
| * Use seconds where possible, and convert to milliseconds for Influxdb consumptionPawel Chojnacki2017-12-212-10/+12
| |
| * Fix tests and formattingPawel Chojnacki2017-12-191-5/+6
| |
| * Make `System.monotonic_time` retun seconds represented by float with ↵Pawel Chojnacki2017-12-121-2/+2
| | | | | | | | microsecond precision
* | Migrate to Project#empty_repo?zj-empty-repo-importerZeger-Jan van de Weg2017-12-201-4/+4
| |
* | [CE->EE] Fix spec/lib/gitlab/git/gitlab_projects_spec.rbValery Sizov2017-12-191-2/+4
| |
* | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-0/+29
|\ \ | | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| * | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-121-2/+4
| | |
| * | Add spec for ActionRateLimiterStan Hu2017-12-121-0/+27
| | |
* | | Merge branch 'no-ivar-in-modules' into 'master'Robert Speicher2017-12-151-0/+2
|\ \ \ | | | | | | | | | | | | | | | | Add cop to make sure we don't use ivar in a module See merge request gitlab-org/gitlab-ce!12800
| * \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-12-1563-432/+2363
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
| * \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-3025-496/+824
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (170 commits) support ordering of project notes in notes api Redirect to an already forked project if it exists Reschedule the migration to populate fork networks Create fork networks for forks for which the source was deleted. Fix item name and namespace text overflow in Projects dropdown Minor backport from EE fix link that was linking to `html` instead of `md` Backport epic tasklist Add timeouts for Gitaly calls SSHUploadPack over Gitaly is now OptOut fix icon colors in commit list Fix star icon color/stroke Backport border inline edit Add checkboxes to automatically run AutoDevops pipeline BE for automatic pipeline when enabling Auto DevOps I am certainly weary of debugging sidekiq but I don't think that's what was meant Ensure MRs always use branch refs for comparison Fix issue comment submit button disabled on GFM paste Lock seed-fu at the correct version in Gemfile.lock Improve indexes on merge_request_diffs ...
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into no-ivar-in-modulesLin Jen-Shin2017-11-2213-15/+403
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (126 commits) Update VERSION to 10.3.0-pre Update CHANGELOG.md for 10.2.0 default fill color for SVGs ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Use Redis cache for branch existence checks Update CONTRIBUTING.md: Link definition of done to criteria Use `make install` for Gitaly setups in non-test environments FileUploader should check for hashed_storage?(:attachments) to use disk_path Set the default gitlab-shell timeout to 3 hours Update composite pipelines index to include "id" Use arrays in Pipeline#latest_builds_with_artifacts Fix blank states using old css Skip confirmation user api Custom issue tracker Revert "check for `read_only?` first before seeing if request is disallowed" add `#with_metadata` scope to remove a N+1 from the notes' API Fix promoting milestone updating all issuables without milestone Batchload blobs for diff generation check for `read_only?` first before seeing if request is disallowed use `Gitlab::Routing.url_helpers` instead of `Rails.application.routes.url_helpers` ...
| * | | | | | Just define allowed_ids and override it with empty valueLin Jen-Shin2017-11-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | if not needed for those sub-classes.
* | | | | | | Merge branch 'rc/use-factory_bot_rails' into 'master'Robert Speicher2017-12-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace factory_girl_rails with factory_bot_rails See merge request gitlab-org/gitlab-ce!15919
| * | | | | | | Replace factory_girl_rails with factory_bot_railsrc/use-factory_bot_railsRémy Coutable2017-12-141-1/+1
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've followed the [upgrade guide](https://github.com/thoughtbot/factory_bot/blob/4-9-0-stable/UPGRADE_FROM_FACTORY_GIRL.md) and ran these two commands: ``` grep -e FactoryGirl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|FactoryGirl|FactoryBot|" grep -e factory_girl **/*.rake **/*.rb -s -l | xargs sed -i "" "s|factory_girl|factory_bot|" ``` Signed-off-by: Rémy Coutable <remy@rymai.me>