Commit Graph

245 Commits

Author SHA1 Message Date
Filipa Lacerda cd5813ee21 Fix comma-dangle in function's arguments errors 2016-11-30 14:24:12 +00:00
Filipa Lacerda edc97c9dc6 Use created date from last_deployment
Adds test

Adds changelog entry
2016-11-30 12:44:42 +00:00
Luke "Jared" Bennett c145413d1a
Remove JSX/React eslint plugins.
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
2016-11-29 16:15:47 +00:00
Alfredo Sumaran 2f35ee4577 Merge branch 'zen-mode-fixture' into 'master'
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
2016-11-28 17:52:02 +00:00
Alfredo Sumaran 060ec3d77d Merge branch 'add-find-poly' into 'master'
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
2016-11-28 17:18:01 +00:00
Alfredo Sumaran c54827961a Merge branch 'dynamic-build-fixture' into 'master'
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
2016-11-28 16:43:46 +00:00
Luke "Jared" Bennett 260749e164
Add `.find` poly 2016-11-25 16:25:19 +00:00
winniehell 31a5ed97a7 Prefer arrow functions in build_spec.js.es6 2016-11-25 11:03:36 +01:00
winniehell 82429b6978 Explicitly name namespace and projects for frontend fixtures 2016-11-25 11:03:35 +01:00
winniehell 918bc207c6 Use Rails test host name for frontend fixtures 2016-11-25 11:03:35 +01:00
winniehell d100f843d7 Remove unnecessary IIFE from build_spec 2016-11-25 11:03:35 +01:00
winniehell aae82d766b Adjust build_spec to match fixture 2016-11-25 11:03:35 +01:00
winniehell 0bf14cb0b5 Create dynamic fixture for build_spec (!7589) 2016-11-25 11:03:31 +01:00
Luis Alonso Chavez Armendariz 5e26745e31 Fix title case to sentence case 2016-11-23 16:34:58 -07:00
Mike Greiling 8ede8603b0 timeago should be a dependency of datetime_utility 2016-11-22 23:47:52 -06:00
Alfredo Sumaran 536ec509d5 Merge branch '24756-clean-up-eslintrc-globals' into 'master'
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
2016-11-23 03:12:33 +00:00
winniehell 4b4fd743c3 Replace static fixture for zen_mode_spec (!7686) 2016-11-23 01:29:32 +01:00
Mike Greiling bd0017c6d4 clean up globals exemptions within .eslintrc 2016-11-22 12:19:51 -06:00
Grzegorz Bizon de24902852 Improve name of build log state data attribute 2016-11-22 14:48:14 +01:00
Jacob Schatz 56b420ae10 Merge branch 'backport-tt' into 'master'
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
2016-11-22 02:46:19 +00:00
Fatih Acet 1a76535780 Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master'
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
2016-11-21 19:55:20 +00:00
Fatih Acet 603a6abe5a Merge branch 'fix-xss-vulnerability' into 'master'
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
2016-11-21 18:16:42 +00:00
Filipa Lacerda 903c81327f Remove v-html 2016-11-21 11:45:22 +00:00
Mike Greiling ed88515d56 convert activities.js to es6 class syntax 2016-11-20 01:32:20 -06:00
Clement Ho c520504610 Fix timeago rendering for environment timeago 2016-11-19 12:17:58 -06:00
Jacob Schatz 18a646c388 Merge branch '24673-broken-test-in-merge_request_widget_spec-js' into 'master'
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
2016-11-19 17:58:52 +00:00
Fatih Acet b9c2fb8810 Merge branch '22539-display-folders' into 'master'
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
2016-11-19 17:46:10 +00:00
Filipa Lacerda 531d4e564b Fix test 2016-11-19 13:29:48 +00:00
Filipa Lacerda 6e5a1ea02a Fix broken test 2016-11-19 13:07:13 +00:00
Filipa Lacerda f9a662c38f Changes for stop url to path 2016-11-19 12:37:54 +00:00
Clement Ho 34eec88c6c Fix spec 2016-11-18 22:47:10 -06:00
Kamil Trzcinski d2007ee6dd Try to fix tests 2016-11-18 23:02:09 +01:00
Filipa Lacerda 43898f8efb Fix broken tests 2016-11-18 19:41:11 +00:00
winniehell 49e726ec33 Add failing test for #24614 2016-11-18 19:11:18 +01:00
Bryce Johnson 9c67b320a7 Backport SmartInterval, PrettyTime, SubbableResource from EE. 2016-11-18 16:49:40 +01:00
winniehell 2a085e5edd Add missing require statements to build_spec 2016-11-18 12:48:25 +01:00
Filipa Lacerda 8bd3f52667 Swaps url for paths in mock data 2016-11-17 20:58:38 +00:00
Grzegorz Bizon 8a7860fd7f Merge branch 'master' into 22539-display-folders
* 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
2016-11-17 20:00:03 +01:00
Filipa Lacerda 022764cc76 Tests 2016-11-16 17:24:49 +00:00
Filipa Lacerda 9c3f9d8464 Adds new line to eof 2016-11-16 16:49:13 +00:00
Filipa Lacerda 4f0a169810 Fix eslint
Remove unused method
2016-11-16 14:49:32 +00:00
Filipa Lacerda f55206cea5 Adds missing tests for commit component 2016-11-16 11:58:28 +00:00
Filipa Lacerda ed07264532 Adds props validation
Improves documentation

Adds tests

Fix prop validation for objects

Finish tests for environment item

Adds tests for toggle folder function

Environment tests

Adds tests
2016-11-16 11:58:21 +00:00
Filipa Lacerda dd80e09a7b Adds tests 2016-11-16 11:58:19 +00:00
Filipa Lacerda 30c6a7d3ac Adds tests
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
2016-11-16 11:58:13 +00:00
Filipa Lacerda 3fef5e66db Adds template functions
Adds commit component
2016-11-16 11:58:09 +00:00
Filipa Lacerda a8508608ea Fixes the tests 2016-11-16 11:58:08 +00:00
Filipa Lacerda 14345b2150 Fix whitespace 2016-11-16 11:58:06 +00:00
Filipa Lacerda b1ec3cb8d2 Adds tests for environment store. 2016-11-16 11:58:06 +00:00
Filipa Lacerda dcafd476db Removes trailing whitespace 2016-11-16 11:58:06 +00:00