summaryrefslogtreecommitdiff
path: root/spec/javascripts
Commit message (Collapse)AuthorAgeFilesLines
* Fixed lint warning and propose fail or warningfix-eslint-warningsLuke "Jared" Bennett2016-12-101-7/+9
|
* Merge branch 'issue_24020' into 'master' Alfredo Sumaran2016-12-091-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix display hook error message ## What does this MR do? Fix hook error message display. ## Are there points in the code the reviewer needs to double check? Probably Hook will return the plain multi line text. It is better `pre` tag than `h4`. I thought of another good looking display, but I did not come up with it. :sweat: ## Why was this MR needed? When the hook returns an STDERR, "Merge in progress" button spinning forever. Due to javascript's error. ## Screenshots (if relevant) When update hook returns an error like ``` XXXXXXXX YYYYYYYY ZZZZZZZZ ``` ![screen_shot](/uploads/8dac77972a309dfcb72c741dffbd7270/screen_shot.png) ## What are the relevant issue numbers? Closes #24020 See merge request !7775
| * fix display hook error messagebasyura2016-12-051-0/+12
| |
* | Adds testsFilipa Lacerda2016-12-094-21/+56
| |
* | Uniformize props name formatFilipa Lacerda2016-12-093-8/+8
| |
* | Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' Fatih Acet2016-12-092-0/+58
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists ## What does this MR do? Fixes issue: 15081 Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists This is done by saving into a cookie when the active tab changes and by always selecting that tab when the page is loaded. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? In order to fix the issue: 15081 ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [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 - [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? Closes #15081 See merge request !7314
| * | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs ExistsJacopo2016-12-022-0/+58
| | | | | | | | | | | | | | | | | | | | | When ldap is enabled and use "Standard" authentication method, if authentication fails the correct tab remain selected. This is done by saving into localStorage when the active tab changes and by always selecting that tab when the page is loaded.
* | | Merge branch 'fix-all-dashboard' into 'master' Sean McGivern2016-12-081-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't whitelist events for all filter Closes #24826 See merge request !7673
| * | | Add issue events filter and make sure "All" really shows everythingOxan van Leeuwen2016-12-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the EventFilter whitelists event types for the "All" filter. This has gotten outdated, which causes the confusing behaviour of the "All" tab not really showing all events. To make matters worse, by default no tab at all is selected, which does show all events, so selecting the "All" tab actually hides some events. Fix this by: - Making sure All always includes all activity, by abolishing the whitelist and just returning all events instead. - Make the All tab selected by default. - Add Issue events tab to include the specific events around opening and closing issues, since there was no specific filter to see them yet. Fixes #24826
* | | | Merge branch 'add-element-extensions-tests' into 'master' Alfredo Sumaran2016-12-051-0/+38
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added element extensions spec for .matches and .closest ## What does this MR do? Adds tests for `Element.prototype.matches` and `Element.prototype.closest`. ## 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 - [ ] 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? See merge request !7755
| * | | Added element extensions spec for .matches and .closestadd-element-extensions-testsLuke "Jared" Bennett2016-12-021-0/+38
| | | |
* | | | Fixed influence from other specs.Steffen Rauh2016-12-051-0/+4
| | | |
* | | | Satisfied eslintSteffen Rauh2016-12-031-5/+5
| | | |
* | | | Fix compatibility with Internet Explorer 11 for merge requestsSteffen Rauh2016-12-032-1/+44
| | | |
* | | | fix eslint failures on Diff and MergeRequestTabsMike Greiling2016-12-021-53/+56
| | | |
* | | | refactor MergeRequestTabs to es6 class syntaxMike Greiling2016-12-021-1/+1
| | | |
* | | | Merge branch '25264-ref-commit' into 'master' Jacob Schatz2016-12-021-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change ref property to commitRef ## What does this MR do? Changes `ref` prop to `commitRef` because `ref` is a reserved word in Vue.js ## Does this MR meet the acceptance criteria? - [x] [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? Closes #25264 //cc @selfup See merge request !7901
| * | | | Change prop name to keep consistency with other props.25264-ref-commitFilipa Lacerda2016-12-021-5/+5
| | | | |
| * | | | Change ref property to commitRefFilipa Lacerda2016-12-021-5/+5
| |/ / /
* | | | Merge branch 'cleanup-common_utils.js' into 'master' Alfredo Sumaran2016-12-022-39/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up common_utils.js ## What does this MR do? - Remove unused functions from `common_utils.js`. - Move functions which are used from only one file to that file. ## Why was this MR needed? Because some utils weren't that common (anymore). See merge request !7318
| * | | Clean up common_utils.js (!7318)winniehell2016-12-012-39/+0
| | | |
* | | | Merge branch 'comments-fixture' into 'master' Alfredo Sumaran2016-12-024-44/+17
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for notes_spec ## What does this MR do? Replace `comments.html.haml` and `issue_note.html.haml` used in `notes_spec.js` by dynamically created fixture. ## What are the relevant issue numbers? #24753 See merge request !7683
| * | | Replace static fixture for notes_spec (!7683)winniehell2016-12-014-44/+17
| | |/ | |/|
* | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-012-0/+68
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines tabs ## What does this MR do? Changes the URL when the builds tab is clicked making it possible to be shared. 1. Adds a standard way to handle linked tabs: * This behaviour is already present in the merge requests, commit and user `show` page. * This MR introduces a reusable way to accomplish this behaviour for pages with static content. 2. Adds test: * For the linked tabs reusable class * For the pipelines tabs ## Why was this MR needed? To allow having a sharable URL that represented the opened tab ![tabs](/uploads/91e663c12c6e9ac46a17aa3a9489dc72/tabs.gif) ## Does this MR meet the acceptance criteria? - [x] [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 - [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? Closes #24814 See merge request !7709
| * | | Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-302-0/+68
| | |/ | |/| | | | | | | | | | | | | | | | | | | Adds tests for the Linked Tabs class Removes event listener Adds builds
* | | Merge branch 'right-sidebar-fixture' into 'master' Fatih Acet2016-12-012-25/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for right_sidebar_spec ## What does this MR do? Replace `right_sidebar.html.haml` for `right_sidebar_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7687
| * | | Replace static fixture for right_sidebar_spec (!7687)winniehell2016-11-282-25/+6
| | | |
* | | | Merge branch 'shortcuts-issuable-fixture' into 'master' Alfredo Sumaran2016-12-012-4/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace static fixture for shortcuts_issuable_spec ## What does this MR do? Replace `issuable.html.haml` for `shortcuts_issuable_spec.js` by already existing dynamically generated fixture. ## What are the relevant issue numbers? #24753 See merge request !7685
| * | | Replace static fixture for shortcuts_issuable_spec (!7685)winniehell2016-11-232-4/+4
| | | |
* | | | 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
| |