4576d55f44
Merge branch 'id-change-total-notes-calculation' into 'master'
...
Change the way totalNotes is calculated
See merge request gitlab-org/gitlab-ce!32191
2019-08-28 08:27:21 +00:00
72544449cf
Change the way totalNotes is calculated
...
totalNotes is only used to prerender a number of
skeleton containers until real notes are loaded
issuable.discussions makes multiple requests, so
too expensive for this
This commit uses mere notes for this and sends
actual totalNotes number if it's less than 10;
otherwise it sends 10 - it allows us to avoid
bunch of skeleton prerenderings, which are not
necessary since they doesn't fit into the whole
screen and disappear quite fast
2019-08-28 08:30:13 +03:00
b4cc539d3c
Move gke_cluster_dropdowns to create_cluster dir
...
This commit creates a create_cluster directory to collect
all Vue applications related to creating kubernetes applications
using gitlab.
It also moves the gke_cluster_dropdowns collection of apps to
the create_cluster directory. gke_cluster_dropdowns contains
dropdown components used to select configuration options to
create a Kubernetes cluster in Google Cloud.
2019-08-27 09:16:01 -04:00
a13abd6731
Add edit_note and spec for editing quick actions
...
Call QuickActionsService on Note update
Add support for notes which just contain
commands after editing
Return http status gone (410) if note was deleted
Temporary frontend addition so it is not
failing when a note is deleted
Move specs to shared examples
Fix rubocop style issue
Deleting note on frontend when status is 410
Use guard clause for note which got deleted
Simplified condition for nil note
This method should no longer be called
with nil note
Refactoring of execute method to reduce
complexity
Move errors update to delete_note method
Note is now deleted visually when it only
contains commands after update
Add expectation
Fix style issues
Changing action to fix tests
Add tests for removeNote and update
deleteNote expectations
2019-08-26 09:20:00 +00:00
b15f03883e
Merge branch '66073-use-time-series-chart-instead-of-area-chart-in-panel_types' into 'master'
...
Enable line charts in dashbaord panels and embedded charts
Closes #66073
See merge request gitlab-org/gitlab-ce!31920
2019-08-24 07:26:17 +00:00
3e5946335d
fix charts scroll handle icon
2019-08-23 10:12:18 +00:00
371e1ed371
Always pre-select "Start a new merge request"
...
One exception: there is an existing MR for the current branch and the
branch is non-default and non-protected.
Extended mock_data for ide/stores to have different types of branches:
default, protected and regular
Cleaned new MR checkbox view
2019-08-22 23:23:06 +00:00
d852112776
Merge branch 'ce-6878-add-epic-select-dropdown' into 'master'
...
Add `searchBy` helper & `SidebarItemEpicsSelect` placeholder component
See merge request gitlab-org/gitlab-ce!31859
2019-08-22 16:01:04 +00:00
6a385b60f8
Remove mergeTrain from FE since it's used only in EE
2019-08-22 13:50:19 +00:00
6044b3ed1e
Add `searchBy` helper & `SidebarItemEpicsSelect`
...
- Adds `searchBy` util in common utils
- Adds placeholder `SidebarItemEpicsSelect`
2019-08-22 17:58:44 +05:30
0bd2d27689
Merge branch 'refactor/notes-getters' into 'master'
...
Refactor nextUnresolvedDiscussionId and previousUnresolvedDiscussionId getters
Closes #65817
See merge request gitlab-org/gitlab-ce!31754
2019-08-21 19:38:27 +00:00
293ef17e73
Backport: Issue sidebar tracking
...
Added snowplow event tracking to Edit buttons
2019-08-21 19:12:11 +00:00
646913f4e2
Fixed tech debt of using custom component
...
Changed the container registry to use the empty state component
Removed the custom svg-component
2019-08-21 18:55:42 +00:00
b7e6c898c7
Resolve "HTML code shown in merge request"
...
- Fixes double escaped text in `mr_widget_rebase.vue`
2019-08-21 14:47:04 +00:00
9cbb1b1093
Replace the area with time series where used
...
- Replace in panel_type.vue
- Replace in embed.vue
- Port changes to support embed in 2 cols in large screens
- Update specs
2019-08-21 09:32:51 -05:00
f2619e21be
This commit adds a new time series component
...
Adds a time series component for line and area charts.
Displays new charts in the dashboard.
- Use dynamic components for line/area swapping
- Add new line charts to dashboard in 2 panels
2019-08-21 13:43:01 +00:00
96b0379219
Merge branch 'ce-22058-improve-ux-multi-assignees-in-mr' into 'master'
...
Improve UX multi assigness in MR
See merge request gitlab-org/gitlab-ce!31545
2019-08-21 12:52:34 +00:00
261f4fe7ac
Fix to show renamed file in mr
2019-08-21 08:23:22 +00:00
a28c77f2ad
Throw error for multiple RecaptchaModal instances
2019-08-21 08:06:50 +00:00
b6ea6d7f9b
CE Port: Use EE panel type to display alert menu correctly in dashboards
2019-08-21 08:06:05 +00:00
1c7cbc25b9
Apply patch and update spec per MR comments
...
- Use wrapper instead of global Vue object
- Use vue utils helper method
- Remove redundant spec tests
2019-08-20 15:15:19 -05:00
f1f34baf6f
Improve UX multi assigness in MR
...
Add merge warning on avatar in:
- open view assigness
- collapsed view assigness
- dropdown (search) view assigness
Add can_merge option to MR sidebar entity
2019-08-20 15:15:18 -05:00
a6319d1726
Embed metrics undefined param fix
2019-08-20 14:51:30 +00:00
51c19691e4
Merge branch 'kp-add-vue-input-autofocus-directive' into 'master'
...
Add `autofocusonshow` directive for input elements
See merge request gitlab-org/gitlab-ce!31584
2019-08-20 08:02:30 +00:00
0d79fe7ed9
Merge branch '64677-delete-directory-webide' into 'master'
...
Fixed deletion of directories in Web IDE
Closes #64677
See merge request gitlab-org/gitlab-ce!31727
2019-08-19 15:04:44 +00:00
6f1985833e
Add `autofocus` directive for input elements
2019-08-19 14:28:39 +05:30
9cba187ac1
Add clipboard button to metric chart dropdown
...
Adds a clipboard button to the metrics dashboard, that allows
copying a link to an individual chart.
2019-08-16 16:21:46 +00:00
79bdb155b6
Rewrite changed_file_icon_spec in Jest
...
- Uses vue-test-utils
- More complete coverage with parameterized tests
2019-08-16 08:58:14 +00:00
f4ce990b0e
Merge branch '24705-multi-selection-for-delete-on-registry-page' into 'master'
...
Resolve "Multi selection for delete on registry page"
Closes #24705
See merge request gitlab-org/gitlab-ce!30837
2019-08-15 23:57:38 +00:00
b179b752e8
Refactor nextUnresolvedDiscussionId and previousUnresolvedDiscussionId getters
2019-08-15 14:07:20 -05:00
3d369a6a99
Merge branch 'ce-11982-merge-trains-helper-text' into 'master'
...
CE backport for gitlab-org/gitlab-ee!14097 : Add merge train helper text to merge request widget
See merge request gitlab-org/gitlab-ce!30686
2019-08-15 05:23:37 +00:00
9e75711aea
Adds download CSV functionality to dropdown in metrics
...
This MR adds the functionality to download metrics data
as CSV. It also removes the exportMetricsToCsvEnabled feature
flag which was used before the dropdown was implemented to
display a button.
2019-08-14 22:57:33 +00:00
896af1acbd
Add merge train helper text to MR widget (CE)
...
This commit adds a helper text that describes what will happen when a
user clicks the "Start/Add to merge train when pipeline succeeds"
button. This text appears at the bottom of the merge request widget.
In addition, this commit renames the "merge_train_info" component to
"merge_train_position_indicator" to avoid ambiguity with the
"merge_train_helper_text" component.
2019-08-14 17:13:09 -04:00
fc99e540f1
Merge branch 'ce-nfriend-fix-the-merge-button' into 'master'
...
CE backport for gitlab-org/gitlab-ee!14894 : Fix the merge button dropdown
See merge request gitlab-org/gitlab-ce!31248
2019-08-14 10:23:20 +00:00
da306cdb0f
Convert spec/javascripts/environments/*rollback* tests to Jest
...
This commit converts two Jasmine tests into Jest tests.
2019-08-12 15:22:58 -04:00
afe0cd0af6
Merge branch 'update-graphicsmagick-to-1.3.33' into 'master'
...
Update GraphicsMagick from 1.3.29 to 1.3.33
See merge request gitlab-org/gitlab-ce!31692
2019-08-12 18:35:16 +00:00
208f9dfe03
Update GraphicsMagick from 1.3.29 to 1.3.33 for CI tests
...
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-08-12 18:54:05 +01:00
eade5c067d
Fix merge button dropdown (CE)
...
This commit fixes an issue that was causing the merge button dropdown
trigger to be shown even if the dropdown itself was hidden. This commit
also fixes an issue that caused the "Merge Immediately" option not to be
available when merge trains were enabled.
2019-08-12 12:31:47 -04:00
4882303760
Fixed deletion of directories in Web IDE
2019-08-12 18:19:38 +02:00
c85cbc08f7
Merge branch '44036-someone-edited-the-issue-at-the-same-time-is-regularly-seen-despite-that-being-a-filthy-lie' into 'master'
...
Fix incorrectly displayed conflict warning
See merge request gitlab-org/gitlab-ce!31469
2019-08-12 09:27:45 +00:00
2f385f7fcb
Merge branch 'fe-fix-diffs-specs-leaking-store' into 'master'
...
[CE] FE fix diffs specs leaking store
See merge request gitlab-org/gitlab-ce!31698
2019-08-12 09:03:29 +00:00
eba4422803
Add kbd shortcuts for discussion navigation
...
Add keyboard shortcuts `p` and `n` to navigate duscussions.
2019-08-12 06:41:04 +00:00
4506434861
Fix conflict warning being incorrectly displayed
...
Hide warning when update request is in progress
2019-08-12 13:42:20 +08:00
8cffa55b2c
CE - FE fix diffs specs leaking store
...
- Export mr_notes module as function
- Update specs refs of mr_notes/stores to factory
EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15097
2019-08-11 18:58:46 -05:00
ccce365ac5
Update karma for new expansion cell markup
...
Also cleans up spec by:
- Add missing `afterEach ... $destroy`
- Add missing `done` call when `$nextTick` was used
2019-08-11 23:46:49 +00:00
fc0ff7cf03
Replace ... with new expansion options
...
- expand upwards
- expand downwards
- expand all
in both inline and parallel views
2019-08-10 02:36:32 +00:00
6a5a624749
Adds button to download metrics data as csv
...
This MR adds a temporary button to be able to
download the Prometheus metrics from charts
to CSV format.
2019-08-09 20:29:33 +00:00
8505049e1f
Merge branch '63181-collapsible-line' into 'master'
...
Makes section title clickable and collapsible
Closes #63181
See merge request gitlab-org/gitlab-ce!31571
2019-08-08 09:04:29 +00:00
055a7b973d
Simplify getTimeDiff function
...
Pass keyname instead of translated string
2019-08-08 00:06:45 +00:00
b689ddd9b6
Do not persist notes filter when auto-switching
...
Send a `persist_filter: false` param to backend when
opening links to notes and auto-switching to show
all notes
2019-08-07 15:45:23 +00:00
Ash McKenzie
Igor Drozdov
Enrique Alcantara
Patrick Derichs
Tim Zallmann
Laura Montemayor
Denys Mishunov
Nick Thomas
Kushal Pandya
Paul Slaughter
Donald Cook
Nick Kipling
Ezekiel Kigbo
Miguel Rincon
Rémy Coutable
Samantha Ming
Winnie Hellmann
Tristan Read
Filipa Lacerda
Thong Kuah
Arun Kumar Mohan
Nathan Friend
Stan Hu
Takuya Noguchi
Sam Bigelow
Heinrich Lee Yu
André Luís
Simon Knox