summaryrefslogtreecommitdiff
path: root/spec/support
Commit message (Collapse)AuthorAgeFilesLines
* Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵Stan Hu2016-06-121-0/+1
| | | | | | | | | | | | | | | | mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
* Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master' Yorick Peterse2016-06-091-0/+33
|\ | | | | | | | | Make Omniauth providers specs to not modify global configuration See merge request !4534
| * Move ImportSpecHelper to spec/support/Kamil Trzcinski2016-06-081-0/+33
| |
* | Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-0/+4
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-091-0/+4
| | | | | | | | | | | | | | | | | | - Need to pass in a `page_slug` to the filter, so it can rewrite based on the current page (all links are rewritten to the level of the app root). - The earlier `markdown_preview` endpoint was at the level of the wiki. We need to know the current page (for rewriting, as above), so this commit moves the endpoint to the level of a wiki page. - Fix all tests
* | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-061-0/+36
|\ \
| * \ Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-0/+36
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # spec/features/builds_spec.rb
| | * | Add feature specs covering U2F registration and authentication.Timothy Andrew2016-06-061-0/+36
| | |/
* | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and featuresKamil Trzcinski2016-06-031-3/+3
|/ /
* | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-021-1/+1
|/
* Merge branch 'separate-banzai-references' into 'master' Douwe Maan2016-06-012-2/+6
|\ | | | | | | | | | | | | | | | | Separate reference gathering from rendering This is a required step to allow batch processing when gathering references. This in turn would allow grabbing (for example) all mentioned users of an issue/merge request using a single query. cc @rspeicher @DouweM See merge request !3969
| * Split Markdown rendering & reference gatheringYorick Peterse2016-05-262-2/+6
| | | | | | | | | | | | | | | | | | | | This splits the Markdown rendering and reference extraction phases into two distinct code bases. The reference extraction phase no longer relies on the html-pipeline Gem (and any related code) and allows for extracting of references from multiple HTML nodes in a single pass. This means that if you want to extract user references from 200 comments you no longer need to run 200 times N number of queries, instead only a handful of queries may be needed.
* | Pass the "Remember me" value to the 2FA token formrs-remember-me-2faRobert Speicher2016-05-301-2/+4
|/ | | | | | | | Prior, if a user had 2FA enabled and checked the "Remember me" field, the setting was ignored because the OTP input was on a new form and the value was never passed. Closes #18000
* Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan2016-05-201-0/+10
|\ | | | | | | | | # Conflicts: # app/services/system_note_service.rb
| * Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-0/+10
| | | | | | | | Gitlab::Diff::InlineDiff
* | Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-05-183-15/+39
|\ \ | | | | | | | | | | | | | | | eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | Fix specsKamil Trzcinski2016-05-161-0/+1
| | |
| * | Improve test coverageKamil Trzcinski2016-05-161-1/+5
| | |
| * | Merge branch 'docker-registry' into docker-registry-viewKamil Trzcinski2016-05-132-15/+15
| |\ \ | | |/
| | * Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-132-15/+15
| | |
| * | Added Docker Registry View testsKamil Trzcinski2016-05-091-0/+12
| |/
| * Ensure URL in all Service subclasses are validRémy Coutable2016-04-251-0/+7
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Transforming milestones link references to the short reference formAlejandro Rodríguez2016-04-201-1/+1
| |
* | Implementing special GitLab markdown reference for milestonesAlejandro Rodríguez2016-04-202-2/+6
|/ | | | | Using the syntax proposed in #13829 [project_reference]%(milestone_id | milestone_name) to get a link to the referred milestone.
* Merge branch 'pmq20/gitlab-ce-issue_12785'Douwe Maan2016-04-191-1/+1
|\
| * Add support to cherry-pick any commitP.S.V.R2016-04-181-1/+1
| | | | | | | | | | Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785 Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
* | Added System Hooks for push and tag_pushGabriel Mazetto2016-04-191-1/+16
| | | | | | | | | | Code is based on Project Webhooks, removing deprecations and without commits listing.
* | Read job variables directly from gitlab CI configGrzegorz Bizon2016-04-181-6/+11
|/
* Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-4/+5
|\ | | | | | | | | | | | | | | | | | | | | Wiki preview URL converting problem [via Markdown] Current implementation when rendering the preview, thinks relative links are for project repository files. We are creating a new preview route that will define correct context data to render for wikis instead. Fixes #2380, #1184 See merge request !3461
| * Fix a few edited references from WikiLinkFilter and specsGabriel Mazetto2016-04-061-4/+5
| |
* | Fix creation of merge requests for orphaned branchesStan Hu2016-04-041-0/+1
| | | | | | | | Closes #14875
* | Added & use Gitlab::Routing for URL helpersroutingYorick Peterse2016-04-012-2/+2
| | | | | | | | | | | | | | Rails' "url_helpers" method creates an anonymous Module (which a bunch of methods) on every call. By caching the output of this method in a dedicated method we can shave off about 10 seconds of loading time for an issue with around 200 comments.
* | Move CarrierWave test env config to separate fileGrzegorz Bizon2016-03-301-0/+7
|/
* Tweaks, refactoring, and specsDouwe Maan2016-03-202-22/+1
|
* Merge branch 'master' into issue_12658Douwe Maan2016-03-203-2/+4
|\
| * Restrict access to references for confidential issuesDouglas Barbosa Alexandre2016-03-171-0/+2
| |
| * Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-171-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | External Users The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects. Partially fix for both #4009 and #13938 (except the LDAP sync or a pattern to detect external users) ![Screen_Shot_2016-03-14_at_22.02.52](/uploads/486a84ab3acb98c6cfb71a4ec7d268e2/Screen_Shot_2016-03-14_at_22.02.52.png) See merge request !3171
| * \ Merge branch 'fix-capybara-deprecation-warnings' into 'master' Robert Speicher2016-03-162-2/+2
| |\ \ | | | | | | | | | | | | | | | | Fix Capybara 2.6.2 deprecation warnings See merge request !3236
| | * | Fix Capybara 2.6.2 deprecation warningsStan Hu2016-03-152-2/+2
| | | |
* | | | Code fixesFelipe Artur2016-03-171-0/+4
| | | |
* | | | Merge 4009-external-users into issue_12658Felipe Artur2016-03-163-61/+15
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-151-0/+13
| |\ \ \ | | |/ /
| | * | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+13
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Allow subscribing (the current user) to a label - Refactor the `Subscription` coffeescript class - The main change is that it accepts a container, and conducts all DOM queries within its scope. We need this because the labels page has multiple instances of `Subscription` on the same page. 2. Creating an issue or MR with labels notifies users subscribed to those labels - Label `has_many` subscribers through subscriptions. 3. Adding a label to an issue or MR notifies users subscribed to those labels - This only applies to subscribers of the label that has just been added, not all labels for the issue.
| * | External UsersZeger-Jan van de Weg2016-03-131-0/+2
| |/ | | | | | | | | The user has the rights of a public user execpt it can never create a project, group, or team. Also it cant view internal projects.
| * Removed benchmark suite and its documentationremove-benchmark-suiteYorick Peterse2016-03-101-61/+0
| | | | | | | | | | | | | | | | | | The rationale for this can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the benchmark suite no longer serves a good purpose now that we have proper production monitoring in place. Fixes gitlab-org/gitlab-ce#13718
* | Add security specsFelipe Artur2016-03-101-0/+17
|/
* Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-241-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
| * Set window_size to 1366*768Alfredo Sumaran2016-02-231-1/+1
| |
* | Add newlineJacob Vosmaer2016-02-171-1/+1
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-172-0/+71
|\ \ | |/ | | | | git-archive-refactor