Commit Graph

3643 Commits

Author SHA1 Message Date
Kushal Pandya 93e58bf9b5 Support for ignore rules in 'convertObjectPropsToCamelCase' helper
Does following enhancements to `convertObjectPropsToCamelCase` helper;
- Adds support for `dropKeys` within  options param
to discard properties.
- Adds support for `allowKeys` within options param
to skip converting property names.
2019-01-31 17:02:46 +05:30
Grzegorz Bizon 6429dc943d Merge branch 'fix/49388' into 'master'
Fix metrics graphs environments dropdown

Closes #49388

See merge request gitlab-org/gitlab-ce!24441
2019-01-31 09:25:48 +00:00
Jose 2375f7ff68 Resolve "Add Avatar from author of the last commit to WebIDE status bar" 2019-01-31 08:22:29 +00:00
Robert Speicher 1414cfae43 Revert "Merge branch '56398-fix-cluster-installation-loading-state' into 'master'"
This reverts merge request !24485
2019-01-30 21:55:28 +00:00
Jacques Erasmus 60ff98f675 Fix cluster installation processing spinner 2019-01-30 16:10:36 +00:00
Winnie Hellmann d8e18a743e Convert noteable_discussion_spec.js to Vue test utils 2019-01-29 20:06:33 +01:00
Martin Hobert 56c62208f6 refactor(NoteableDiscussion): Extracted ResolveDiscussionButton from 2019-01-28 22:44:17 +00:00
Phil Hughes 958a819fce Merge branch 'refactor/56369-extract-jump-to-next-discussion-button' into 'master'
Refactor/56369 extract jump to next discussion button

Closes #56369

See merge request gitlab-org/gitlab-ce!24506
2019-01-28 17:33:20 +00:00
Martin Hobert 3af7723fcd refactor(NoteableDiscussion): Extracted JumpToNextDiscussionButton to its own component
fix #56369

chore(changelog): Added changelog entry

chore(prettier): Formated with prettier

test(JumpToNextDiscussionButton): Added test for new component

test(Refactored tests to use vue test-utils):

chore(translations): Added newly generated locales

Update spec/javascripts/notes/components/discussion_jump_to_next_button_spec.js
chore(prettier): Formated with prettier

test(JumpToNextDiscussionButton): Updated tests to use a local vue instance

test(JumpToNextDiscussionButton): Running tests in async to prevent maximum stack overflow
2019-01-28 11:36:44 +01:00
Phil Hughes f438618115 Merge branch 'winh-note-actions-vue-test-utils' into 'master'
Convert note_actions_spec.js to Vue test utils

See merge request gitlab-org/gitlab-ce!24665
2019-01-25 12:11:53 +00:00
Phil Hughes cc29bc61e0 Merge branch 'db-copy-as-gfm-prosemirror' into 'master'
Reimplement Copy-as-GFM using the prosemirror document model

See merge request gitlab-org/gitlab-ce!22797
2019-01-25 11:38:42 +00:00
Winnie Hellmann 52963c8940 Apply suggestion to spec/javascripts/test_bundle.js 2019-01-25 10:47:41 +00:00
Winnie Hellmann 8e6d2cca24 Convert note_actions_spec.js to Vue test utils 2019-01-25 10:59:22 +01:00
Winnie Hellmann a71d02bb16 Add workaround for Vue test utils setProps
see https://github.com/vuejs/vue-test-utils/issues/631#issuecomment-421108344
2019-01-25 10:59:05 +01:00
Filipa Lacerda e055f7d3ca Merge branch 'diff-fix-folder-path-commas' into 'master'
Fixed diff tree folders being rendered incorrectly

See merge request gitlab-org/gitlab-ce!24635
2019-01-25 09:36:50 +00:00
Filipa Lacerda 965dbbd24c Merge branch 'diff-settings-dropdown' into 'master'
Added dropdown for diff settings

Closes #55491

See merge request gitlab-org/gitlab-ce!24460
2019-01-25 09:20:12 +00:00
Mike Greiling ef6311d689 Upgrade webpack and monaco-editor to latest 2019-01-25 08:22:35 +00:00
Clement Ho 6e085eea53 Merge branch 'sh-bump-chrome-golang-ci-image' into 'master'
Bump CI image to use Chrome 71.0 and Golang 1.11

Closes #56614 and #55578

See merge request gitlab-org/gitlab-ce!24572
2019-01-24 16:25:31 +00:00
Phil Hughes f10d75ecf6
Fixed diff tree folders being rendered incorrectly 2019-01-24 16:14:14 +00:00
Phil Hughes 2f40aa68d9
Added dropdown for diff settings
Dropdown includes buttons for tree view rendering mode
and buttons for the compare view (inline or side-by-side)

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55491
2019-01-24 14:48:03 +00:00
Filipa Lacerda 355d8ef72a Adds create option in filtered dropdown
In the filtered search dropdopwn adds a button
to enable creation of missing element.
2019-01-24 11:46:38 +00:00
Douwe Maan 8a03dbf8b7
Use nodes and marks to power Copy-as-GFM
The spec needed to be updated because in some cases the resulting
Markdown is slightly different, though equally valid.
2019-01-24 12:06:53 +01:00
Douwe Maan a7e77e10fe
Add tiptap/prosemirror nodes and marks for all Markdown and GFM features
The schema is built on top of the default schema and Node and Mark
classes provided by tiptap-extensions. prosemirror-model is used to
parse HTML/DOM into a prosemirror document, and prosemirror-markdown is
used to serialize this document to (GitLab Flavored) Markdown.
2019-01-24 12:06:52 +01:00
Lukas Eipert 0152cb0dd4
Fix discussion counter spec mock data
To me it seems like the mock data does not match the actual data
anymore. I checked the actual data and to me it seems like the resolved
property actually should live in the overall discussion object.
2019-01-23 12:39:46 +01:00
Filipa Lacerda 3ed8078507 Merge branch '25569-changing-wording-to-delete-when-referring-to-removing-a-branch' into 'master'
Resolve "Changing wording to "Delete" when referring to removing a branch"

Closes #25569

See merge request gitlab-org/gitlab-ce!23966
2019-01-23 11:02:22 +00:00
Lukas Eipert 7db474ff78
Remove favicon check from mrWidgetOptions spec
The method that actually creates the favicon is already unit tested, I
would have loved to mock it out, but ist is not possible without using
rewire. So I decided we just check that the favicon href is changed and
use that as a proxy for calling `setFaviconOverlay`
2019-01-23 10:59:49 +01:00
Phil Hughes 52ceda4479 Merge branch 'dm-trim-discussion-truncated-line-first-chars' into 'master'
Fix bug that caused Suggestion Markdown toolbar button to insert snippet with leading +/-/<space>

See merge request gitlab-org/gitlab-ce!24568
2019-01-23 08:45:17 +00:00
Sam Bigelow c607b35824 Use 'delete' instead of 'remove' for source branch
This is to match `git branch -D <branchname>`
2019-01-22 12:57:01 -05:00
Douwe Maan 03df54b226
Trim first char of diff line text on diff discussions
Before, diff file `higlighted_diff_lines`/`parallel_diff_lines` and
diff discussion `truncated_diff_lines` were inconsistent: `text` and
`rich_text` on the latter included the leading +/-/<space> character,
like on the backend, while the former had no `text` and its `rich_text`
had dropped this char.

This resulted in a bug when the suggestions feature expected these diff
line objects to be identical in format and thus interchangeable, which
was not the case.
2019-01-22 17:00:16 +01:00
Phil Hughes 7b6fa5ffcb Merge branch 'leipert-make-canvas-more-tolerant' into 'master'
Make favicon tests more fault resistent

Closes #50527

See merge request gitlab-org/gitlab-ce!22686
2019-01-22 15:20:12 +00:00
Filipa Lacerda ed1da73020 Merge branch '53856-changing-group-visibility-does-not-re-enable-save-button' into 'master'
Resolve "Changing group visibility does not re-enable Save button"

Closes #53856

See merge request gitlab-org/gitlab-ce!23022
2019-01-22 10:41:01 +00:00
Sam Bigelow a0146dceb6 Resolve "Merge request file browser should always be possible show/hide" 2019-01-22 08:29:41 +00:00
Luke Bennett 88ce491fc9
Fix DirtySubmit handling of checkbox and radio inputs
Most browsers do not fire the "input" event for checkboxes or radios.
Adds a "change" listener to properly trigger these DirtySubmit updates.
2019-01-22 02:04:32 +00:00
syasonik db054bc166 Support flat response for envs index route
To support environment folders in the UI on the Environments List
page, the environments index route previously returned one environment
per folder, excluding those other than the latest deploy. However, the
environtments dropdown on the metrics dashboard requires that any
environment be selectable.

To accommodate both use cases, support an optional 'nested' parameter
in the index route to return either a flat, complete response or a
nested response based on the use case in question. The new default
response structure is the flat response.
2019-01-21 14:51:16 -06:00
Lukas Eipert 91df6d9ef4
Make favicon tests more fault resistent
It seems like every new version of Chrome renders the favicon canvas
differently. This reduces the problems with it by creating a more fault
tolerant check, which compares the color values in the pixels and is
okay if they are within a certain threshold.
2019-01-21 20:48:55 +01:00
Martin Wortschack 51a9c54923 Resolve "Admin Settings: Cannot read property 'addEventListener' of null" 2019-01-21 12:39:11 +00:00
Jacques Erasmus 0cd37ad9d9 Remove unwanted margin above suggested changes. 2019-01-18 19:35:06 +00:00
Filipa Lacerda 75ead9a4f3 Merge branch 'diff-tree-collapse-directories' into 'master'
Collapses directory structure in merge request tree

Closes #53069

See merge request gitlab-org/gitlab-ce!24392
2019-01-18 11:19:32 +00:00
Kushal Pandya c01f673610 Merge branch 'user-avatar-list-empty-text' into 'master'
Handle emptyText in user_avatar_list

See merge request gitlab-org/gitlab-ce!24436
2019-01-18 06:48:24 +00:00
Phil Hughes 24b98a8793
Added specs for mutations & utils methods 2019-01-16 17:24:05 +00:00
Paul Slaughter 3420ec15dd
Handle emptyText in user_avatar_list
**Why?**
To reduce duplicate code, it's helpful to encapsulate this behavior
here.
2019-01-16 09:39:35 -06:00
Natalia Tepluhina 7407dfdc20 Resolve "In Merge Request diff screen, master is not a hyperlink" 2019-01-16 13:18:10 +00:00
Jacques Erasmus f3b9eda913 Add syntax highlighting to suggestion preview 2019-01-15 13:37:49 +00:00
Natalia Tepluhina bce50453fa Resolve "When merging an MR, the squash checkbox isn't always supported" 2019-01-15 09:11:34 +00:00
Winnie Hellmann 159c18221d Make parseBoolean idempotent 2019-01-15 06:04:37 +00:00
Filipa Lacerda 3bbc9a4b44 Merge branch 'move-job-cancel-btn' into 'master'
Move job cancel button

Closes #55944 and #54812

See merge request gitlab-org/gitlab-ce!24074
2019-01-14 09:42:10 +00:00
Simon Knox 5a5212542a List Sentry Errors in GitLab - Frontend 2019-01-11 22:52:26 +00:00
Fernando Arias c814446b55 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into move-job-cancel-btn 2019-01-11 12:11:17 -05:00
Fernando Arias a536fe2850 Code cleanup of headerActions and tests
* Remove headerAction getter from job getters
* Remove prop from being passed into header_ci_component
* Remove no longer needed tests
2019-01-11 11:14:53 -05:00
Phil Hughes 8d1683f7b0
Support multiple outputs in Jupyter notebooks
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/31910, https://gitlab.com/gitlab-org/gitlab-ce/issues/32588
2019-01-11 10:14:51 +00:00