summaryrefslogtreecommitdiff
path: root/spec/factories
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into ↔Grzegorz Bizon2017-04-221-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (274 commits) Update VERSION to 9.2.0-pre Update CHANGELOG.md for 9.1.0 Update Auto Deploy documentation Disable import URL field in New project form since it's hidden by default Remove reference to burndown charts since they don't exist for ce. Use master_password for Sentinel Refactor Discussions docs Start versioning cached markdown fields Refactor add_users method for project and group Improved the spec Now correctly tests against different forms Refactor environments components into vue files - part 3 Adding animation for all dropdown fix placeholder visibility submodule_links: handle urls that don't end with .git Add help regarding vue resource and where to include it Append .json to ajax endpoint to prevent browser to display raw json Fixed the preview keyboard shortcut focusing wrong tab Fix broken link Added new discussions docs Started on resolvable discussions docs ...
| * Don't delete a branch involved in an open merge request in "Delete all ↔sh-issue-29247-fixStan Hu2017-04-191-0/+4
| | | | | | | | | | | | | | | | | | merged branches" service Customers were surprised by the previous behavior, which destroyed branches even though an open merge request existed for it. Closes #29427
* | Merge branch 'master' into ↔Grzegorz Bizon2017-04-138-6/+125
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/manual-actions-protected-branches-permissions * master: (641 commits) Revert "Fix registry for projects with uppercases in path" Fix registry for projects with uppercases in path Move event icons into events_helper Reset New branch button when issue state changes Add link to environments on kubernetes.md Indent system notes on desktop screens Improve webpack-dev-server compatibility with non-localhost setups. Add changelog entry Fix recent searches icon alignment in Safari Use preload to avoid Rails using JOIN Fix NUMBER_OF_TRUNCATED_DIFF_LINES re-definition error Prepare for zero downtime migrations Fix filtered search input width for IE Fix the `gitlab:gitlab_shell:check` task Fixed random failures with Poll spec Include CONTRIBUTING.md file when importing .gitlab-ci.yml templates Let uses hide verbose output by default Separate examples for each other Collapse similar sibling scenarios Use empty_project for resources that are independent of the repo ... Conflicts: app/views/projects/ci/builds/_build.html.haml
| * Add specsDouwe Maan2017-04-101-1/+2
| |
| * Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-071-0/+4
| |\
| | * Merge branch 'adam-finish-5993-closed-issuable' into 'master' Douwe Maan2017-04-071-0/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Add indication for closed or merged issuables in GFM Closes #1369 See merge request !9462
| | | * Add indication for closed or merged issuables in GFMadam-finish-5993-closed-issuableAdam Buckland2017-04-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: for issues that are closed, the links will now show '[closed]' following the issue number. This is done as post-process after the markdown has been loaded from the cache as the status of the issue may change between the cache being populated and the content being displayed. In order to avoid N+1 queries problem when rendering notes ObjectRenderer populates the cache of referenced issuables for all notes at once, before the post processing phase. As a part of this change, the Banzai BaseParser#grouped_objects_for_nodes method has been refactored to return a Hash utilising the node itself as the key, since this was a common pattern of usage for this method.
| * | | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-072-1/+25
| |\ \ \ | | |/ /
| | * | Merge branch ↔Sean McGivern2017-04-071-1/+3
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
| | | * Update tests to cover trigger scheduleKamil Trzcinski2017-04-071-1/+3
| | | |
| | | * Fix ref referenceKamil Trzcinski2017-04-071-0/+4
| | | |
| | | * before_create :set_project. Now TriggerSchedule saves project from parentShinya Maeda2017-04-071-4/+0
| | | |
| | * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-071-0/+22
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| | | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-064-1/+67
| | | |\ | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| | | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-061-0/+4
| | | |\ \
| | | * \ \ Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0622-55/+64
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/dispatcher.js # app/assets/stylesheets/pages/projects.scss
| | | * | | | Renamed ProtectedTag push_access_levels to create_access_levelsJames Edwards-Jones2017-04-041-5/+5
| | | | | | |
| | | * | | | Protected tags copy/paste from protected branchesJames Edwards-Jones2017-03-311-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should provide basic CRUD backend for frontend to work from. Doesn’t include frontend, API, or the internal API used from gitlab-shell
| * | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-071-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge remote-tracking branch 'origin/master' into optimise-pipelinesoptimise-pipelinesKamil Trzcinski2017-04-066-1/+81
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Define baseline for test for pipelines serializerKamil Trzcinski2017-04-061-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-064-1/+67
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/javascripts/filtered_search/dropdown_hint.js # app/views/shared/issuable/_search_bar.html.haml
| | * | | | | Merge branch ↔Kamil TrzciƄski2017-04-062-0/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation' into 'master' Resolve "Run CI/CD pipelines on a schedule" - "Basic backend implementation" See merge request !10133
| | | * | | | | Improve trigger_schedule.rbShinya Maeda2017-04-061-6/+0
| | | | | | | |
| | | * | | | | Rename cron_time_zone to cron_timezone. Separate add_concurrent_foreign_key.Shinya Maeda2017-04-061-4/+4
| | | | | | | |
| | | * | | | | Rename cron_nightly_build to nightlyShinya Maeda2017-04-061-3/+3
| | | | | | | |
| | | * | | | | Move Ci::CronParser to Gitlab::Ci::CronParserShinya Maeda2017-04-061-4/+4
| | | | | | | |
| | | * | | | | Resolve error on trigger.specShinya Maeda2017-04-061-1/+2
| | | | | | | |
| | | * | | | | Fix spec/factories_spec.rbShinya Maeda2017-04-061-0/+2
| | | | | | | |
| | | * | | | | Brush upShinya Maeda2017-04-062-4/+9
| | | | | | | |
| | | * | | | | real_next_run (WIP)Shinya Maeda2017-04-062-37/+9
| | | | | | | |
| | | * | | | | Add validation to Ci::TriggerSchedule (Halfway)Shinya Maeda2017-04-062-8/+10
| | | | | | | |
| | | * | | | | Fixed strcture for db changeShinya Maeda2017-04-062-1/+1
| | | | | | | |
| | | * | | | | Rename ScheduledTrigger to TriggerSchedule. Because table structure changed.Shinya Maeda2017-04-061-3/+2
| | | | | | | |
| | | * | | | | basic componentsShinya Maeda2017-04-061-1/+17
| | | | | | | |
| | | * | | | | Add scheduled_trigger model. Add cron parser. Plus, specs.Shinya Maeda2017-04-061-0/+42
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge branch 'feature/multi-level-container-registry-images' into 'master' Kamil TrzciƄski2017-04-061-0/+33
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-level container registry images Closes #17801 See merge request !10109
| | | * \ \ \ \ Merge commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971' into ↔feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-061-0/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/multi-level-container-registry-images * commit '46e4ed6bd0c8c256bce6d35b4bb992d77fd09971': (28 commits) Award emoji button smiley animation Introduced empty/error UX states to environments monitoring. Github import rake task Remove individual modal width styles Fix RuboCop for removing index Link to docs site for file in doc/ Disable invalid service templates (again) Show CI status as Favicon on Pipelines, Job and MR pages STL file viewer Wait for the PDF to be loaded before doing anything remove unnecessary lease as cron job Search for opened MRs - include reopened MRs ProjectsFinder should handle more options Clearly show who triggered the pipeline in email Make it possible to preview pipeline success/failed emails Add remove_concurrent_index to database helper Add more tests for subgroups feature Large features by the 1st, small ones by the 3rd Ask people to create EE MRs on the 7th fix project authorizations migration issue ...
| | | * | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-062-0/+10
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (94 commits) Merge branch 'open-redirect-fix-continue-to' into 'security' Merge branch 'open-redirect-host-fix' into 'security' Merge branch 'path-disclosure-proj-import-export' into 'security' Merge branch '29364-private-projects-mr-fix' Merge branch '30125-markdown-security' Issue title realtime Update CHANGELOG.md for 8.16.9 Update CHANGELOG.md for 8.17.5 Update CHANGELOG.md for 9.0.4 Add "search" optional param and docs for V4 Use PDFLab to render PDFs in GitLab Separate Scala from Java in CI examples Fix broken link Reorganize CI examples, add more links Refactor CI index page Remove deprecated field from workhorse response Use gitlab-workhorse 1.4.3 Document how ETag caching middleware handles query parameters Make group skip validation in the frontend Use NamespaceValidator::WILDCARD_ROUTES in ETag caching middleware ...
| | | * | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-0417-50/+44
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (57 commits) Ensure we generate unique usernames otherwise validations fail Fix a Knapsack issue that would load support/capybara.rb before support/env.rb Ensure users have a short username otherwise a click event is triggered ... Enable the `bullet_logger` setting; enable `raise` in test environment Fix Rubocop offenses Set the right timeout for Gitlab::Shell#fetch_remote Refactoring Projects::ImportService Move methods that are not related to mirroring to the repository model Fix GitHub pull request formatter spec Rename skip_metrics to imported on the importable concern Add CHANGELOG Remove unused include from RepositoryImportWorker Skip MR metrics when importing projects from GitHub Fetch GitHub project as a mirror to get all refs at once Make file templates easy to use and discover Ensure user has a unique username otherwise `user10` would match `user1` Ensure the AbuseReport fixtures create unique reported users Don't use FFaker in factories, use sequences instead Fix brittle specs Fix the AbuseReport seeder ... Conflicts: db/schema.rb
| | | * | | | | Ensure root container repository when visiting registryGrzegorz Bizon2017-04-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Root container repository is a images repository that had been created before 9.1, before we introduced multi-level images support.
| | | * | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-04-033-3/+9
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (230 commits) Fix N+1 query in loading pipelines in merge requests Fix Spinach and Capybara dependencies Prevent users from disconnecting gitlab account from CAS 30276 Move issue, mr, todos next to profile dropdown in top nav Refactor SearchController#show Properly eagerly-load the Capybara server for JS feature specs only Updating documentation to include a missing step in the update procedure Eager-load the Capybara server to prevent timeouts Increase Capybara's timeout Add metrics button to Environment Overview page Fix link to Jira service documentation Handle parsing OpenBSD ps output properly to display sidekiq infos on ... Eliminate unnecessary queries that add ~500 ms of load time for a large issue 20914 Limits line length for project home page Allow users to import GitHub projects to subgroups Update dpl CI example Fix the docs:check:links job Don't clean up the gitlab-test-fork_bare repo Make GitLab use Gitaly for commit_is_ancestor Remove unnecessary ORDER BY clause from `forked_to_project_id` subquery ...
| | | * | | | | | Improve code related to removing container image tagsGrzegorz Bizon2017-03-311-6/+14
| | | | | | | | |
| | | * | | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-03-272-2/+1
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (192 commits) Implement new service for creating user Update sentry-raven 2.0.2 -> 2.4.0 Update webmock 1.21.0 -> 1.24.6 Update spring 1.7.2 -> 2.0.1 Update simplecov 0.12.0 -> 0.14.1 Update pry-rails 0.3.4 -> 0.3.5 Update pry-byebug 3.4.1 -> 3.4.2 Update flay 2.6.1 -> 2.8.1 Remove Tags filter from Projects Explore dropdown Update capybara-screenshot 1.0.11 -> 1.0.14 Update bullet 5.2.0 -> 5.5.1 Update brakeman 3.4.1 -> 3.6.1 Remove web-console gem Update better_errors 1.0.1 -> 2.1.1 Display flash message to unauthenticated user when creating new issue Fix up emoji tests that should have failed :/ Fix RSpec/DescribeSymbol cop violations Add event limit warning all tabs Cycle Analytics Adding non_archived scope for counting projects Resolve "Gitlab administrator cannot create projects in every group" ... Conflicts: db/schema.rb
| | | * | | | | | | Fix specs for container repository tagsGrzegorz Bizon2017-03-241-12/+11
| | | | | | | | | |
| | | * | | | | | | Fix specs for container repository model classGrzegorz Bizon2017-03-232-22/+22
| | | | | | | | | |
| | | * | | | | | | Merge branch 'master' into feature/multi-level-container-registry-imagesGrzegorz Bizon2017-03-2115-41/+159
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (1327 commits) Merge branch 'render-json-leak' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'fix-links-target-blank' into 'security' Merge branch '28058-hide-emails-in-atom-feeds' into 'security' Fix karma test Reset filters after click Handle Route#name being nil after an update Only add frontend code coverage instrumentation when generating coverage report fix recompile assets step in 9.0 upgrade guide to use yarn Undo explicit conversion to Integer Make level_value accept string integers Make feature spec more robust Removed d3.js from the main application.js bundle Extend compound status for manual actions specs Update css to be nice and tidy. Fix pipeline status for transition between stages add an index to the ghost column Return 404 in project issues API endpoint when project cannot be found Improve rename projects migration ... Conflicts: doc/ci/docker/using_docker_build.md spec/lib/gitlab/import_export/all_models.yml
| | | * | | | | | | Adding mock for full_access_tokenAndre Guedes2017-02-221-0/+1
| | | | | | | | | |
| | | * | | | | | | Fixes broken and missing testsAndre Guedes2017-02-221-0/+21
| | | | | | | | | |
| | * | | | | | | | Optimise trace handling code to use streaming instead of full readKamil TrzciƄski2017-04-061-1/+1
| | | |_|_|_|_|_|/ | | |/| | | | | |
View Lorry Controller Status