summaryrefslogtreecommitdiff
path: root/spec/helpers
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Make HTTP(s) label consistent on clone barStan Hu2016-03-191-0/+19
| | | | | | | | | | Sites that use http:// for the external_url should always display HTTP on the clone bar. Similarly, sites that use https:// should show HTTPS.
* | Fix specsDouwe Maan2016-03-201-9/+1
| |
* | Tweaks, refactoring, and specsDouwe Maan2016-03-201-15/+0
| |
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-201-2/+10
|\ \ | |/
| * Fix specslabel-tooltipRémy Coutable2016-03-181-2/+10
| |
* | Improve group visibility level featureZeger-Jan van de Weg2016-03-181-7/+2
| |
* | Merge 4009-external-users into issue_12658Felipe Artur2016-03-161-3/+3
|\ \ | |/
| * Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-croppingRémy Coutable2016-03-151-3/+3
| | | | | | | | | | This reverts commit 01160fc06182de89c400af174861f6545ad6ceb8, reversing changes made to 4bff9daf8b6d85e9c78565e21cfaa3f6d36f0282.
* | Add permission level to groupsFelipe Artur2016-03-102-0/+23
|/
* Make better use of the `visibility_level` factory traitsrs-traits-are-goodRobert Speicher2016-03-081-3/+3
|
* Use Gitlab::Git::DiffCollectionsJacob Vosmaer2016-03-031-54/+3
|
* Add `:with_avatar` trait to User factoryRobert Speicher2016-02-241-3/+3
|
* Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-1/+1
|\ | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * Fix specs expecting `emoji/` in image pathRobert Speicher2016-02-131-1/+1
| |
* | Fix relative links in other markup formatsben.boeckel/gitlab-ce-fixup-links-in-generic-docsBen Boeckel2016-02-121-0/+4
|/ | | | | | | | - Apply the RelativeLinkFilter filter to other formats, e.g., reStructuredText so links from the Files view or the Project view work - Remove the AsciidocPipeline pipeline Fixes #3533.
* Allow link_to_label to take an optional type argrymai/gitlab-ce-3007-fix-mr-label-linksRémy Coutable2016-02-041-18/+15
| | | | | | You can set type: :merge_request to create a link to merge request lists instead of issues list. Accept both Symbol & String as type argument for the link_to_label helper
* Fix broken testsDmitriy Zaporozhets2016-02-041-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix specs and add a new oneDouwe Maan2016-01-301-4/+13
|
* Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-0/+5
| | | | Closes #12677
* Move parallel diff logic to separate classDouwe Maan2016-01-201-18/+0
|
* Refactor Gitlab::Highlight and fix testsDouwe Maan2016-01-191-30/+33
|
* Merge branch 'master' into issue_3945Rubén Dávila2016-01-145-65/+80
|\
| * Use the WikiPipeline when rendering the wiki markdown contentDouglas Barbosa Alexandre2016-01-141-2/+3
| |
| * Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-131-0/+20
| |
| * Update broadcast_message helperRobert Speicher2016-01-131-12/+30
| | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown.
| * Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-0/+4
| | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
| * Add two custom Date/Time conversion formatsRobert Speicher2016-01-071-4/+4
| |
| * Don't override issue page description in project layout.Douwe Maan2016-01-061-4/+2
| |
View Lorry Controller Status