summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-091-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+2
| | | | | | | | | | | | | | | | | | - 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 remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-061-7/+4
|\ \
| * \ Merge branch 'master' into awardablesZJ van de Weg2016-05-302-2/+2
| |\ \ | | |/
| * | Merge branch 'master' into awardablesZJ van de Weg2016-05-251-2/+2
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardablesFatih Acet2016-05-182-48/+94
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-118-12/+169
| |\ \ \ \
| * | | | | Create table for award emojiZeger-Jan van de Weg2016-05-061-7/+4
| | | | | |
* | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-022-3/+3
| |_|_|_|/ |/| | | |
* | | | | Enable RSpec/NotToNot cop and auto-correct offensesrs-rubocop-nottonotRobert Speicher2016-05-242-2/+2
| |_|_|/ |/| | | | | | | | | | | Also removes the note from the development/testing.md guide
* | | | Create DiffFilter and change SystemNoteService#change_title to use ↵Adam Butler2016-05-181-2/+2
| |_|/ |/| | | | | | | | Gitlab::Diff::InlineDiff
* | | Merge branch 'rs-cleanup-events_helper_spec' into 'master' Douwe Maan2016-05-121-47/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up EventsHelper spec Extracted from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4090 See merge request !4133
| * | | Clean up EventsHelper specRobert Speicher2016-05-121-47/+48
| | |/ | |/|
* | | more readable specs for enabled_button_based_providers and ↵Andrei Gliga2016-05-121-15/+29
| | | | | | | | | | | | button_based_providers_enabled?
* | | DRYing enabled_button_based_providers testsAndrei Gliga2016-05-121-7/+4
| | |
* | | enabled_button_based_providers into their own describe sectionAndrei Gliga2016-05-121-0/+2
| | |
* | | use stub_application_setting insteadAndrei Gliga2016-05-121-10/+4
| | |
* | | between ""Andrei Gliga2016-05-121-1/+1
| | |
* | | tests for button_based_providers_enabled? helper method of AuthHelperAndrei Gliga2016-05-121-0/+18
| | |
* | | tests for enabled_button_based_providers helper method of AuthHelperAndrei Gliga2016-05-121-1/+21
|/ /
* | Merge branch 'rs-backport-ee-372' into 'master' Rémy Coutable2016-05-091-5/+5
|\ \ | | | | | | | | | | | | | | | | | | 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-5/+5
| | | | | | | | | | | | Mostly replaces several Spinach tests with RSpec Feature tests.
* | | Update SVG sanitizer to conform to SVG 1.1Stan Hu2016-05-061-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Loofah scrubber since sanitize 2.x transformers are inadequate to handle case-sensitive SVG attributes. sanitize parses documents as HTML instead of XML, which causes all SVG attribute names (e.g. viewBox) to be downcased. * SVG element list: https://www.w3.org/TR/SVG/eltindex.html * SVG attribute list: https://www.w3.org/TR/SVG/attindex.html Closes #14555
* | | Sanitize repo paths in new project error messageStan Hu2016-05-041-0/+9
|/ / | | | | | | Closes #17243
* | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-05-021-0/+36
|\ \
| * | Ensure URL in all Service subclasses are validRémy Coutable2016-04-251-0/+36
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Updated label links to work correctly for filteringsidebar-label-linkPhil Hughes2016-04-261-4/+4
|/ / | | | | | | See !3846#note_5033951
* | Fix license detection to detect all license files, not only known licensesRémy Coutable2016-04-251-0/+26
| | | | | | | | | | | | Fixes #15470. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'rs-diff_view' into 'master' Rémy Coutable2016-04-221-0/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always read diff_view setting from the cookie Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557 and https://gitlab.com/gitlab-org/gitlab-ce/issues/15285 See merge request !3732
| * | Always read diff_view setting from the cookieRobert Speicher2016-04-141-0/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, when the user had their view set to "parallel" and then visited a merge request's changes tab _without_ passing the `view` parameter via query string, the view would be parallel but the `Notes` class was always instantiated with the default value from `diff_view` ("inline"), resulting in broken markup when the form to add a line note was dynamically inserted. The cookie is set whenever the view is changed, so this value should always be up-to-date. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14557
* | Merge branch 'ci-commit-as-pipeline' into 'master' Kamil Trzciński2016-04-211-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ci::Commit becomes a Pipeline object 1. Ci::Commit receives context: ref, :tag. 1. One Ci::Commit describes a one Pipeline 1. Pipeline is created from `.gitlab-ci.yml` 1. Pipeline is a ordered group of builds 1. We test MR against Pipeline 1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703) 1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future) 1. We add a Pipeline Hook that will be triggered on Pipeline status change (future) 1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future) After merging that I'll prepare a separate MR that will unify naming, database columns, table names: ``` Ci::Commit -> Pipeline Ci::Build -> Build CommitStatus -> Job GenericCommitStatus -> ExternalJob ci_commits -> pipelines ci_builds -> jobs ``` This MR implements first 5 points. This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149. See merge request !3653
| * | Cleanup changesKamil Trzcinski2016-04-131-1/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-132-32/+28
| |\ \ | | |/
| * | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineKamil Trzcinski2016-04-111-0/+46
| |\ \ | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/commits/_commit.html.haml
| * | | Fix specsKamil Trzcinski2016-04-111-2/+2
| | | |
* | | | Merge branch 'imported-ghe-project-names-links-to-github' into 'master' Robert Speicher2016-04-191-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub project's link in the import page when provider has a custom URL Closes gitlab-org/gitlab-ee#478 See merge request !3803
| * | | | Fix GitHub project's link on import page when provider has a custom URLDouglas Barbosa Alexandre2016-04-191-0/+25
| | |_|/ | |/| |
* | | | Remove persistent XSS vulnerability in `commit_person_link` helperRobert Speicher2016-04-171-0/+29
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we were incorrectly supplying the tooltip title as `data-original-title` (which Bootstrap's Tooltip JS automatically applies based on the `title` attribute; we should never be setting it directly), the value was being passed through as-is. Instead, we should be supplying the normal `title` attribute and letting Rails escape the value, which also negates the need for us to call `sanitize` on it. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15126
* | | Merge branch 'decouple-member-notification' into 'master' Douwe Maan2016-04-121-28/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple membership and notifications This allow you to have notification setting per project even if you are member of group. It also creates background for having notification settings in project you are not member of. - [x] Make it work - [x] Migrations - [x] CHANGELOG - [x] More tests - [x] API For #3359 After this merge request there is still some work to be done: * create migration that remove duplicates in notification settings table and create uniq index (8.8 probably) * remove notification_level field from Member model in 9.0 * make proper API for notification settings * use `MemberCreateService` instead of Member#after_create callback for creating notification settings (after #14709) * maybe more tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3421
| * \ \ Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-112-7/+46
| |\ \ \ | | | |/ | | |/|
| * | | Refactor notification helper and fix notification serviceDmitriy Zaporozhets2016-03-301-28/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'issue_1752' into 'master' Robert Speicher2016-04-111-4/+19
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix milestone removal problem when editing issues fixes #1752 See merge request !3571
| * | | improve specs code syntaxissue_1752Felipe Artur2016-04-071-11/+11
| | | |
| * | | Fix milestone removal problem when editing issuesFelipe Artur2016-04-061-0/+15
| |/ /
* | | Merge branch 'rs-form_errors' into 'master' Dmitriy Zaporozhets2016-04-111-0/+46
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize the way we check for and display form errors - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard. See merge request !3531
| * | Standardize the way we check for and display form errorsrs-form_errorsRobert Speicher2016-04-041-0/+46
| |/ | | | | | | | | | | | | | | | | | | | | | | - Some views had a "Close" button. We've removed this, because we don't want users accidentally hiding the validation errors and not knowing what needs to be fixed. - Some views used `li`, some used `p`, some used `span`. We've standardized on `li`. - Some views only showed the first error. We've standardized on showing all of them. - Some views added an `#error_explanation` div, which we've made standard.
* | Remove `random_markdown_tip` helperrs-remove-markdown-tipsRobert Speicher2016-04-091-7/+0
|/ | | | Only usage got removed in !3442
* Implementing 'Groups View' and 'TODOs View' as options for dashboard ↵Elias Werberich2016-03-241-1/+3
| | | | | | preferences. Fixes #14585.
* Merge branch 'master' into issue_12658Douwe Maan2016-03-212-3/+22
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * change the css class has_tooltip to has-tooltip universallychange_css_class_has_tooltip_to_has-tooltipArinde Eniola2016-03-201-3/+3
| |
View Lorry Controller Status