summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Fix comma-dangle in function's arguments errors24844-environments-dateFilipa Lacerda2016-11-301-2/+2
|
* Use created date from last_deploymentFilipa Lacerda2016-11-301-0/+14
| | | | | | Adds test Adds changelog entry
* Remove JSX/React eslint plugins.remove-jsx-react-eslint-pluginsLuke "Jared" Bennett2016-11-296-24/+24
| | | | | | | | | | | | Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins. Change `airbnb` to `airbnb-base` for .eslintrc `extends` value. Added changelog entry Made sure all plugins and envs are set Corrected new failing specs
* Merge branch 'zen-mode-fixture' into 'master' Alfredo Sumaran2016-11-282-12/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for zen_mode_spec ## What does this MR do? Replace `zen_mode.html.haml` for `zen_mode_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7686
| * Replace static fixture for zen_mode_spec (!7686)winniehell2016-11-232-12/+5
| |
* | Merge branch 'add-find-poly' into 'master' Alfredo Sumaran2016-11-282-23/+46
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `.find` poly ## What does this MR do? Adds `[].find()` poly ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7710
| * | Add `.find` polyadd-find-polyLuke "Jared" Bennett2016-11-252-23/+46
| | |
* | | Merge branch 'dynamic-build-fixture' into 'master' Alfredo Sumaran2016-11-286-207/+177
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create dynamic fixture for build_spec ## What does this MR do? Replace `spec/javascripts/fixtures/build.html.haml` by a dynamically created fixture (using `rake teaspoon:fixtures`). ## Why was this MR needed? The existing fixture was not representing the real page. ## What are the relevant issue numbers? #24614 would have been avoided following !6059 See merge request !7589
| * | Prefer arrow functions in build_spec.js.es6winniehell2016-11-251-14/+14
| | |
| * | Explicitly name namespace and projects for frontend fixtureswinniehell2016-11-254-4/+6
| | |
| * | Use Rails test host name for frontend fixtureswinniehell2016-11-253-13/+14
| | |
| * | Remove unnecessary IIFE from build_specwinniehell2016-11-251-143/+141
| | |
| * | Adjust build_spec to match fixturewinniehell2016-11-251-9/+16
| | |
| * | Create dynamic fixture for build_spec (!7589)winniehell2016-11-253-72/+34
| | |
* | | Fix title case to sentence caseLuis Alonso Chavez Armendariz2016-11-231-2/+2
| | |
* | | timeago should be a dependency of datetime_utilitymove-timeago-to-vendor-dirMike Greiling2016-11-222-2/+1
|/ /
* | Merge branch '24756-clean-up-eslintrc-globals' into 'master' Alfredo Sumaran2016-11-233-2/+10
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up globals exemptions within .eslintrc ## What does this MR do? Removes unnecessarily-exempted globals from `.eslintrc` where possible. ## Are there points in the code the reviewer needs to double check? `npm run eslint` should return 0 errors. ## Why was this MR needed? see Issue #24756 ## Does this MR meet the acceptance criteria? - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24756 See merge request !7642
| * clean up globals exemptions within .eslintrcMike Greiling2016-11-223-2/+10
| |
* | Improve name of build log state data attributefix/build-without-trace-exceptionsGrzegorz Bizon2016-11-221-1/+1
|/
* Merge branch 'backport-tt' into 'master' Jacob Schatz2016-11-223-0/+358
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport SmartInterval, PrettyTime, SubbableResource from EE. ## What does this MR do? Backports infrastructure used for EE-only Timetracking so it can be used and improved upon in CE. This doesn't really need review... it was already reviewed and merged in EE. There are no side effects or conflicts, just three new classes added: 1. `SubbableResource` -- pubsub for ajax resources 2. `SmartInterval`-- for configurable polling 3. `PrettyTime` -- time parsing and formatting utility methods - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/985 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/870 cc: @jschatz1 See merge request !7573
| * Backport SmartInterval, PrettyTime, SubbableResource from EE.backport-ttBryce Johnson2016-11-183-0/+358
| |
* | Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master' Fatih Acet2016-11-211-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Activity entries are not loaded fully to cover full window's height" ## What does this MR do? Fixes a bug in which a browser window large enough to encompass the default number of items in an auto-loading endless-scroll list could not trigger the loading of additional items. ## Are there points in the code the reviewer needs to double check? I refactored activities.js and pager.js into es6 syntax while I was investigating the issue. No changes were made other than some es6 flourishes and eslint conformity, so nothing should be effected, but perhaps best to double check other pages which utilize these scripts. ## Screenshots (if relevant) ![endless-scroll-fixed](/uploads/b672b606826af745528c209ab6cfe95c/endless-scroll-fixed.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24499 See merge request !7608
| * | convert activities.js to es6 class syntaxMike Greiling2016-11-201-1/+1
| | |
* | | Merge branch 'fix-xss-vulnerability' into 'master' Fatih Acet2016-11-211-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove v-html ## What does this MR do? Uses string interpolation instead of `v-html` to prevent xss attacks. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? See merge request !7616
| * | | Remove v-htmlFilipa Lacerda2016-11-211-1/+1
| |/ /
* | | Fix timeago rendering for environment timeago24552-js-environment-timeago-is-not-rendered-and-text-shows-object-object-in-mr-widgetClement Ho2016-11-191-1/+53
|/ /
* | Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master' Jacob Schatz2016-11-191-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken merge request widget spec ## What does this MR do? Converts the invalid es6 syntax of the merge_request_widget_spec which is actually causing the spec not to run through teaspoon ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Get specs working again ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24673 See merge request !7594
| * | Fix spec24673-broken-test-in-merge_request_widget_spec-jsClement Ho2016-11-181-2/+2
| |/
* | Merge branch '22539-display-folders' into 'master' Fatih Acet2016-11-1911-0/+701
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
| * | Fix test22539-display-foldersFilipa Lacerda2016-11-191-22/+11
| | |
| * | Fix broken testFilipa Lacerda2016-11-191-0/+20
| | |
| * | Changes for stop url to pathFilipa Lacerda2016-11-191-16/+0
| | |
| * | Try to fix testsKamil Trzcinski2016-11-181-4/+5
| | |
| * | Fix broken testsFilipa Lacerda2016-11-182-11/+11
| | |
| * | Swaps url for paths in mock dataFilipa Lacerda2016-11-171-11/+10
| | |
| * | Merge branch 'master' into 22539-display-foldersGrzegorz Bizon2016-11-1729-29/+29
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (154 commits) Fix typos Fix wrong changelog item Add missing item for 8.13.6 Change last_used_at to use touch Add chat_name partial Mention Git strategy none Fix code review adds fix for security issue when annonymous user does not ... Remove ToC since it's now supported in the docs portal itself Add 8.14 to versions with further additions to review apps Add Limitations sections to environments and review apps docs Add link to environments docs Fix URL to review apps docs Add a prerequisites section, add some links Link to NGINX example project for the time being Get rid most of the irrelevant sections Add note about current limitation in $CI_BUILD_REF_NAME Add an intro and an Overview section for Review Apps WIP review apps Add Review apps link to CI README ... Conflicts: spec/features/environments_spec.rb
| * | TestsFilipa Lacerda2016-11-161-1/+1
| | |
| * | Adds new line to eofFilipa Lacerda2016-11-161-1/+1
| | |
| * | Fix eslintFilipa Lacerda2016-11-161-2/+0
| | | | | | | | | | | | Remove unused method
| * | Adds missing tests for commit componentFilipa Lacerda2016-11-161-68/+107
| | |
| * | Adds props validationFilipa Lacerda2016-11-165-274/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves documentation Adds tests Fix prop validation for objects Finish tests for environment item Adds tests for toggle folder function Environment tests Adds tests
| * | Adds testsFilipa Lacerda2016-11-161-10/+108
| | |
| * | Adds testsFilipa Lacerda2016-11-1611-0/+589
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests. Changes instance into a constructor Adds tests for environments component Adds tests assertations Adds external URL test Adds tests for Rollback component Adds tests for stop component Adds tests for actions component Fix environment item Init environment item tests
| * | Adds template functionsFilipa Lacerda2016-11-161-1/+1
| | | | | | | | | | | | Adds commit component
| * | Fixes the testsFilipa Lacerda2016-11-162-32/+142
| | |
| * | Fix whitespaceFilipa Lacerda2016-11-161-5/+1
| | |
| * | Adds tests for environment store.Filipa Lacerda2016-11-162-82/+50
| | |
| * | Removes trailing whitespaceFilipa Lacerda2016-11-161-2/+2
| | |
| * | Fixes filterFilipa Lacerda2016-11-162-2/+22
| | |
| * | Adds tests for environments storeFilipa Lacerda2016-11-162-0/+96
| | |