summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Added text_utility to JS testsmarkdownerPhil Hughes2016-06-201-6/+7
|
* Merge branch '13525-sane-defaults-for-merge-request-js-class-constructor' ↵Jacob Schatz2016-06-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Avoid a TypeError when initializing MergeRequest JS class with no arg ## What does this MR do? Avoid a TypeError when initializing MergeRequest JS class with no arg. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this sane default you would get the following error when you tried to instantiate a new MergeRequest object with no argument (i.e. `new MergeRequest();`): TypeError: undefined is not an object (evaluating 'this.opts.action') ## What are the relevant issue numbers? Fixes #13525. ## Does this MR meet the acceptance criteria? - [x] No CHANGELOG since it's a trivial internal change - [x] Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4667
| * Avoid a TypeError when initializing MergeRequest JS class with no arg13525-sane-defaults-for-merge-request-js-class-constructorRémy Coutable2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | Without this sane default you would get the following error when you tried to instantiate a new MergeRequest object with no argument (i.e. `new MergeRequest();`): TypeError: undefined is not an object (evaluating 'this.opts.action') Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-163-1/+34
|\ \ | | | | | | | | | | | | | | | | | | category-search-dropdown # Conflicts: # app/assets/javascripts/lib/common_utils.js.coffee
| * | Prevent default disabled buttons and links.preventdefault-disabled-buttonsFatih Acet2016-06-152-0/+32
| | |
| * | Fix teaspoon spec.17333-u2f-only-after-authenticatorTimothy Andrew2016-06-151-1/+2
| |/ | | | | | | | | - We added a `current_user.two_factor_via_otp?` check to the view. When rendering the view via the teaspoon fixture, `current_user` is `nil`.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Fatih Acet2016-06-101-7/+6
|\ \ | |/ | | | | category-search-dropdown
| * Move award_menu_url variable into gon object.Fatih Acet2016-06-091-7/+6
| |
* | Fix specs and add new tests.Fatih Acet2016-06-101-42/+62
| |
* | Added tests for categorised search autocomplete.Fatih Acet2016-06-074-2/+141
|/
* Merge branch 'notes-are-awardables' into 'master' Douwe Maan2016-06-066-13/+1224
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes are awardables ## What does this MR do? Makes sure we can :thunder_cloud_rain: comments/notes. ## What are the relevant issue numbers? Follows up upon !2901, depends on !3785 Closes #3655 ## Screenshots (if relevant) TODO See merge request !4291
| * Updated MR notes.notes-are-awardablesFatih Acet2016-06-061-4/+4
| |
| * Added tests for award emoji feature.Fatih Acet2016-06-066-13/+1224
| |
* | Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-061-6/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgraded jQuery to version 2 ## What does this MR do? Upgrades jQuery to 2.2.1. Had to include the task_list JS file directly as it includes jQuery 1 directly https://github.com/github-archive/task_list/blob/master/app/assets/javascripts/task_list.coffee#L8 so when we change jQuery to `jquery2` it was including both jQuery 1 & 2. ## Are there points in the code the reviewer needs to double check? For any JS errors ## What are the relevant issue numbers? Closes #12440 See merge request !4384
| * | Fixed JS errorsjquery2Phil Hughes2016-06-051-6/+6
| |/ | | | | | | CHANGELOG item
* | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-062-0/+53
| | | | | | | | | | | | - Move the `authenticate_with_two_factor` method from `ApplicationController` to the `AuthenticatesWithTwoFactor` module, where it should be.
* | Implement U2F registration.Timothy Andrew2016-06-063-0/+73
|/ | | | | | | | | | | - Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components
* Move JS graph specs to match assets tree.Connor Shea2016-06-013-0/+0
|
* Fix teaspoonConnor Shea2016-06-013-3/+3
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into #15643Fatih Acet2016-05-231-0/+1
|\ | | | | | | | | # Conflicts: # app/assets/stylesheets/pages/issuable.scss
| * Dropdown implementationzj-gitignore-dropdownAlfredo Sumaran2016-05-201-0/+1
| |
* | Added specs for right sidebar.Fatih Acet2016-05-122-0/+82
|/
* Fix build notification on merge request page change even if the build status ↵Benedikt Huss2016-05-081-0/+6
| | | | didn't change
* Feedback from stanhuBenedikt Huss2016-05-051-3/+17
|
* Merge request widget displays TeamCity build state and code coverage ↵Benedikt Huss2016-05-051-0/+35
| | | | correctly again
* Placeholder on milestone formPhil Hughes2016-04-141-0/+1
| | | | Updated JS spec to include gl_form
* Updated based on Ruby feedbackPhil Hughes2016-04-121-12/+13
|
* Tests updatePhil Hughes2016-04-122-22/+24
|
* Merge branch 'close-issue-bug' into 'master' Jacob Schatz2016-04-051-3/+3
|\ | | | | | | | | | | | | Fix data check in update issue response See merge request !3548
| * Update issue_spec testclose-issue-bugAnnabel Dunstone2016-04-051-3/+3
| |
* | Tests updatePhil Hughes2016-04-041-1/+1
|/
* Change `js-quick-submit` behavior to expect the class on the formRobert Speicher2016-03-021-3/+3
| | | | | Now it will work on any field inside that form, and it's easier to scope new behavior, which is what we're adding next!
* Project dropdown test span -> iPhil Hughes2016-02-051-1/+1
|
* Changed the project switcher dropdown togglePhil Hughes2016-02-051-2/+2
| | | | | | Moved the positioning of the dropdown to be more aligned with the title Closes #13219 and #13214
* Merge branch 'title-projects-dropdown' into 'master' Jacob Schatz2016-02-023-0/+54
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added dropdown to list all projects on project header Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4212 When clicking the current project name, it shows a dropdown menu with a list of all projects for that group or user. When closed: ![Screen_Shot_2016-01-14_at_19.17.44](/uploads/a7258ba388dba238fc2f0468711fc729/Screen_Shot_2016-01-14_at_19.17.44.png) When open: ![Screen_Shot_2016-01-14_at_19.17.51](/uploads/716533d9eb44b123c5fdff36a4740489/Screen_Shot_2016-01-14_at_19.17.51.png) cc. @jschatz1 See merge request !2438
| * added testsPhil Hughes2016-01-303-0/+54
| |
* | Allow manual resize of js-autosize textareasrs-relax-autosizeRobert Speicher2016-02-011-0/+11
|/ | | | | | | | | | | | | | First, the autosize library was being too controlling and removed the `resize` property from any elements to which it was attached, removing the drag handle. Second, we detect when the user manually resizes an autosize textarea, and then remove the autosize behavior from it and increase its max-height. This should allow for the best of both worlds. Closes #12832
* reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-122-99/+1
|
* fixes conflictsJacob Schatz2016-01-113-37/+30
|\
| * Refactor ZenModers-zenmode-cleanupRobert Speicher2016-01-082-21/+14
| | | | | | | | | | | | | | | | - No longer depends on the "hidden checkbox". - No longer depends on manually storing/restoring the scroll position. Instead, we take advantage of jquery.scrollTo. - Event-based. - Simplifies the state-based styling.
| * fixes ajax issue with issue specajax-issues-fixJacob Schatz2016-01-071-16/+16
| |
* | adds tests (and passes them) for ajax open and close merge requests.Jacob Schatz2016-01-063-2/+100
|/
* Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-252-1/+97
|\ | | | | | | | | | | | | open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
| * removes unused `alert` from issue spec. Requires flash in the ↵close-open-ajax-issueJacob Schatz2015-12-232-8/+2
| | | | | | | | *implementation* instead of the spec.
| * adds test for issue close/reopen failureJacob Schatz2015-12-232-4/+60
| |
| * fixes tests to work with jasmine/jqueryJacob Schatz2015-12-232-13/+16
| |
| * adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-10/+1
| |
| * clarifies tests with methods like `toBeVisible()` etc.Jacob Schatz2015-12-211-12/+9
| |
| * updates tests style for four-phase-testing as per: ↵Jacob Schatz2015-12-211-1/+17
| | | | | | | | https://robots.thoughtbot.com/four-phase-test
| * open and close issue via ajax request. With testsJacob Schatz2015-12-212-1/+40
| |