summaryrefslogtreecommitdiff
path: root/spec/factories
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-201-0/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (353 commits) Put some admin settings in dropdown Add styleguide on configuration settings documentation Remove Duplicated keys add UNIQUE index to fingerprint Avoid autoload issue such as 'Mail::Parsers::AddressStruct' Move appearance settings as sub tab to application settings use rails root join fixed a couple of errors spotted in production Fix RangeError exceptions when referring to issues or merge requests outside of max database values Fix bug in `WikiLinkFilter`. Grammar and typographic changes to artifacts documentation Tweak grammar Small frontend code fixes and restore 8a2d88f commit Warn about admin privilege to disable GitHub Webhooks Listing GH Webhooks doesn't stop import process for non GH admin users fixup! updated docs for api endpoint award emoji Update CHANGELOG Ensure Todos counters doesn't count Todos for projects pending delete Add endpoints for award emoji on notes Sort API endpoints and implement feedback Add endpoints for Award Emoji ...
| * Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-162-0/+20
| |\
| * \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-141-6/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-098-17/+43
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-06-032-13/+15
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 2979-personal-access-tokensTimothy Andrew2016-05-1114-223/+11
| |\ \ \ \ \
| * | | | | | Allow expiration of personal access tokens.Timothy Andrew2016-04-281-0/+9
| | | | | | |
* | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Lin Jen-Shin2016-06-172-0/+20
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: (337 commits) Update CHANGELOG for !4659 Center the header logo for all Devise emails Add previews for all customized Devise emails Customize the Devise `unlock_instructions` email Customize the Devise `reset_password_instructions` email Customize the Devise `password_change` emails Use gitlab-git 10.2.0 Use Git cached counters on project show page Fix indentation scss-lint errors Added title attribute to enties in tree view Closes #18353 Banzai::Filter::ExternalLinkFilter use XPath Reduce queries in IssueReferenceFilter Use gitlab_git 10.1.4 Fixed ordering in Project.find_with_namespace Fix images in emails Banzai::Filter::UploadLinkFilter use XPath Turn Group#owners into a has_many association Make project_id nullable CHANGELOG [ci skip] CHANGELOG [ci skip] ...
| * | | | | | Improve validationsKamil Trzcinski2016-06-151-0/+1
| | | | | | |
| * | | | | | Add specs for models and servicesKamil Trzcinski2016-06-142-0/+19
| | |_|_|_|/ | |/| | | |
* | | | | | Adopt the rename from ci_commits to ci_pipelinesLin Jen-Shin2016-06-151-0/+0
|/ / / / /
* | | | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-131-6/+0
| |_|_|/ |/| | |
* | | | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wiki linking behavior for markdown wiki pages Related to #18019 - As per the documentation in !4372 ## TODO - [ ] !4432 Have wiki linking behave as per the documentation - [x] Move `WikiLinkFilter` specs to the pipeline level - [x] Verify current behavior on wiki `show` page - [x] Fix current behavior on wiki `show` page - [x] Verify current behaviour on wiki preview - [x] Fix current behaviour on wiki preview - [x] Rewrite all links and get preview links working - [x] Make sure all links are on-par with the wiki `show` page - [x] TDD `WikiLinkFilter` and get it working - [x] Hook `WikiLinkFilter` up - [x] Fix tests - [x] Fix `markdown_spec` - [x] Fix `wiki` spinach feature - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.) - [x] Test in different ruby versions - [x] GitLab instances hosted on a relative URL - [x] Non-markdown rendering formats? - [x] RDoc - [x] ASCIIDoc - [x] Create issues to fix things for RDoc and ASCIIDoc - [x] Gauge performance impact - [x] Refactor - [x] Re-organize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes - [x] Respond to @rymai's comments - [x] `class WikiLinkFilter < HTML::Pipeline::Filter` - [x] blank line after guard clause - [x] keyword arguments for `wiki` and `slug` - [x] invert the condition - [x] inline `user` in spec - [x] Make sure spec names are not out of date - [x] Comment for each rewrite rule - [x] Add CHANGELOG entry - [x] Reorganize commits - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes - [ ] Wait for merge See merge request !4432
| * | | | Implement the correct linking behaviour in `WikiLinkFilter`.Timothy Andrew2016-06-091-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original Comments ================= - Linking behaves as per rules documented here: https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md - All links (to other wiki pages) are rewritten to be at the level of the app root. We can't use links relative to the current page ('./foo', 'foo', '../foo'), because they won't work in the markdown preview, where the current page is suffixed with `/edit` - Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes sense to run these tests on the combined output of the pipeline, rather than a single filter, since we can catch issues with conflicting filters. - Add more tests to cover the new linking @rymai's Review =============== - Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s inherit, so nothing changes if the nested class is loaded first. - Add a blank line after a guard clause - Use keyword arguments for the `Rewriter` constructor - Invert a condition - use `if` instead of `unless` - Inline a `let` in `WikiPipeline` spec - it was only used in a single place - Change out of date spec names - Add a comment for every rewrite rule in `Rewriter`
* | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-1/+21
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-1/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # spec/features/builds_spec.rb
| | * | | | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-062-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
* | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-062-6/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # features/steps/shared/builds.rb # spec/requests/ci/api/builds_spec.rb
| * | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-062-6/+12
| |\ \ \ \ \ | | |/ / / /
| | * | | | Incorportate feedbackZ.J. van de Weg2016-06-011-6/+0
| | | | | |
| | * | | | Merge branch 'master' into awardablesZJ van de Weg2016-05-301-11/+9
| | |\ \ \ \ | | | |/ / /
| | * | | | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-0/+4
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-181-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/projects/merge_requests_controller.rb # app/models/note.rb # db/schema.rb # spec/models/note_spec.rb
| | * \ \ \ \ \ Merge branch 'master' into awardablesZeger-Jan van de Weg2016-05-1116-223/+27
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Add tests on Awardables and Award EmojiZeger-Jan van de Weg2016-05-101-0/+11
| | | | | | | |
| | * | | | | | Create table for award emojiZeger-Jan van de Weg2016-05-062-6/+7
| | | | | | | |
* | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-033-7/+7
|/ / / / / / /
* | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-032-2/+2
| | | | | | |
* | | | | | | Rename Ci::Build commit to pipelineKamil Trzcinski2016-06-032-2/+2
| | | | | | |
* | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Improve note factoryGrzegorz Bizon2016-05-291-5/+2
| | | | | |
* | | | | | Improve notes factoryGrzegorz Bizon2016-05-291-4/+1
| | | | | |
* | | | | | Minor changes in note validation specsGrzegorz Bizon2016-05-291-10/+12
| | | | | |
* | | | | | Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-291-6/+15
| | | | | |
* | | | | | Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-291-5/+4
| | | | | |
* | | | | | Update note factory to include noteable associationGrzegorz Bizon2016-05-291-12/+6
| |_|_|/ / |/| | | |
* | | | | Create a todo on failing MR buildSean McGivern2016-05-171-0/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit.
* | | | Update specsDouwe Maan2016-05-131-2/+2
| |/ / |/| |
* | | Remove the annotate gem and delete old annotationsJeroen van Baarsen2016-05-0913-219/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | In 8278b763d96ef10c6494409b18b7eb541463af29 the default behaviour of annotation has changes, which was causing a lot of noise in diffs. We decided in #17382 that it is better to get rid of the whole annotate gem, and instead let people look at schema.rb for the columns in a table. Fixes: #17382
* | | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-091-3/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from gitlab-org/gitlab-ee!372 Mostly replaces several Spinach tests with RSpec Feature tests. See merge request !4043
| * | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372Robert Speicher2016-05-041-3/+7
| | | | | | | | | | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests.
* | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabledRobert Speicher2016-05-081-1/+0
|/ / /
* | | Backported minimal safewebhook implementation to GitLab CEGabriel Mazetto2016-04-301-0/+4
| |/ |/|
* | Fix wiki testsSebastian Klier2016-04-202-0/+16
|/
* Merge branch 'connorshea/gitlab-ce-revoke-authorized-application' into 'master' Rémy Coutable2016-04-143-1/+32
|\ | | | | | | | | | | | | | | | | | | | | Fix revoking of authorized OAuth applications Users were not able to revoke access to authorized OAuth applications. Clicking the "Revoke" button would result in a 404 page, and the application would still be authorized. Added a spec and also found that the `gon` variables were not being set for this view. Closes #14370 See merge request !3690
| * Include GonHelper separately and remove created_at in factoryStan Hu2016-04-141-1/+0
| |
| * Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-143-1/+33
| | | | | | | | | | | | Closes #14370 Move gon function into its own helper
* | Refactor and expose only Gitlab::UrlBuilder.build(record)simplify-gitlab-url_builder-15202Rémy Coutable2016-04-131-0/+12
|/ | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Reload forked_project_link projectsYorick Peterse2016-04-041-0/+5
| | | | | | | This fixes ./spec/services/projects/unlink_fork_service_spec.rb which somehow started failing on the master branch. It certainly isn't a very elegant solution but seems to be the easiest/best way of solving this problem for the time being.
* Extend specs for GFM uploads rewriterGrzegorz Bizon2016-03-311-2/+3
|
View Lorry Controller Status