2a829d0f53
Fixed the y_label not setting correctly for each graph on the monitoring dashboard
2017-07-03 10:43:56 -05:00
e48f54b5b2
Merge branch 'enable-webpack-code-splitting' into 'master'
...
Enable webpack code splitting
Closes #32989
See merge request !12032
2017-06-30 20:55:09 +00:00
8513072e96
Merge branch 'winh-issue-show-aftereach' into 'master'
...
Remove empty afterEach() from issue_show app_spec.js
See merge request !12577
2017-06-30 20:12:04 +00:00
9e3ef082be
Remove placeholder note when award emoji slash command is applied
2017-06-30 14:10:09 +00:00
553346a4f4
Remove empty afterEach() from issue_show app_spec.js
2017-06-29 22:31:58 +00:00
88c60307bd
Merge branch 'dm-merge-request-creations-controller' into 'master'
...
Split up MergeRequestsController
See merge request !12150
2017-06-29 11:57:06 +00:00
70b05a8377
Split up MergeRequestsController
2017-06-28 18:17:44 -05:00
f26d477865
dynamically import emoji helpers for AwardsHandler class
2017-06-28 13:04:34 -05:00
500d3a990e
Merge branch 'winh-no-current-user-search-bar' into 'master'
...
Add condition if there is a current user to DropdownUser
See merge request !12415
2017-06-28 16:16:46 +00:00
5870fc5daf
Merge branch 'cherry-pick-5ea675be' into 'master'
...
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'
See merge request !12454
2017-06-28 15:49:42 +00:00
08ad0af49c
Merge branch 'refactor-emoji-utils' into 'master'
...
Refactor emoji helpers in preparation for async loading
See merge request !12432
2017-06-28 05:51:30 +00:00
6ab12777bc
Introduce addClassIfElementExists utility
2017-06-27 20:37:30 +02:00
2da314212f
Slightly refactor pipeline schedules form in preparation for additions
2017-06-27 16:52:13 +00:00
64b0a799f3
Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page"
2017-06-27 16:06:38 +00:00
abfb59109d
Add failing test for #34141
2017-06-27 16:31:01 +02:00
99bdfd189b
Merge branch 'issue-form-multiple-line-markdown' into 'master'
...
Fixed multi-line markdown in issue edit form
Closes #34318
See merge request !12458
2017-06-27 11:34:21 +00:00
018f7e46c7
Merge branch 'winh-mr-widget-no-pipeline' into 'master'
...
Handle missing pipeline in merge request widget
Closes #32987
See merge request !12127
2017-06-27 08:33:47 +00:00
28c45b047d
Polish sidebar toggle
2017-06-27 08:06:35 +00:00
9d6bbc92c9
move glEmojiTag method to emoji helper
2017-06-27 00:54:34 -05:00
27a1348f20
split emoji support methods from the async module
2017-06-27 00:10:17 -05:00
9cc3500e25
Fix endpoint not being update correctly
2017-06-26 16:50:58 +00:00
1fc9262e3d
Handle Promise rejections in mr_widget_pipeline_spec.js
2017-06-26 17:43:29 +02:00
2c95411737
Fixed multi-line markdown in issue edit form
...
Closes #34318
2017-06-26 16:23:06 +01:00
871bf96c9b
Merge branch 'additional-metrics-dashboard' into '28717-additional-metrics-review-branch'
...
Additional metrics dashboard
See merge request !11740
2017-06-26 14:44:03 +00:00
47face0175
Merge branch 'winh-karma-suppress-vue-tips' into 'master'
...
Suppress Vue tips when running Karma
See merge request !12379
2017-06-26 13:19:14 +00:00
27b98beac9
Merge branch 'issue-inline-edit-quick-submit' into 'master'
...
Fixes ctrl+enter not submit issue edit form
Closes #33758
See merge request !12422
2017-06-26 09:28:43 +00:00
ae5a020773
Merge branch '33223-multiple-tooltips-on-the-same-vue-component' into 'master'
...
Add support for multiple tooltips in the same Vue component
Closes #33223
See merge request !11954
2017-06-26 08:44:00 +00:00
6d4e8154b0
Fixes ctrl+enter not submit issue edit form
...
Closes #33758
2017-06-24 13:32:31 +01:00
f0a4b4875f
update import locations for karma specs
2017-06-23 15:25:21 -05:00
925eea2672
Make JavaScript tests fail for unhandled Promise rejections
2017-06-23 09:28:19 +00:00
6cb575d612
Add support for multiple tooltips in the same Vue component
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33223
2017-06-23 02:12:45 -05:00
1a58170bd4
Suppress Vue tips when running Karma
2017-06-22 20:21:54 +02:00
8fe5602c1a
Merge branch '28717-additional-metrics-review-branch' into 'master'
...
Support additional prometheus metrics - review branch
Closes #28717
See merge request !11712
2017-06-22 16:35:05 +00:00
13bb887bf9
Merge branch '34010-fix-linking-to-parallel-diff-line-number-creating-gray-box' into 'master'
...
Fix linking to line number on parallel diff creating empty discussion box
Closes #34010
See merge request !12332
2017-06-22 16:27:48 +00:00
db86a993e3
Resolve "Can't sort Groups"
2017-06-22 16:08:48 +00:00
97c42df3b8
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch
2017-06-22 15:05:52 +02:00
07742c0254
Add failing test for #32987
2017-06-22 10:06:58 +02:00
9f0b85bf26
Revert to using links instead of buttons in Issuable Index tabs.
2017-06-21 12:50:59 -04:00
5145e39ef7
Fix linking to line number on parallel diff creating empty discussion
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/34010
2017-06-21 10:16:06 -05:00
40eb825368
Revert "Merge branch 'winh-merge-request-related-issues' into 'master'"
...
This reverts commit 6ac777a759025cbc2ad4
2017-06-21 15:25:11 +02:00
b2e1d32e7a
Merge branch '33868-fix-mr-changes-diff-note-up-arrow-editing' into 'master'
...
Fix pressing up-arrow on a MR "Changes" diff discussion edits your last note
Closes #33868
See merge request !12297
2017-06-20 19:31:02 +00:00
05cfba6f6d
Uniformize code between both pipelines tables
2017-06-20 14:54:55 +00:00
5dc253f138
Stop showing task status if no tasks are present
...
Previously the task status would be visible even if there where no tasks
in the description. This fixes that by changing the regex to check for
tasks without 0.
This also fixes a bug where update the description inline would not
update the task status text on screen.
Closes #33880
2017-06-20 10:58:07 +01:00
2955e95604
Clean up Vue warnings in tests
2017-06-20 08:05:55 +00:00
a67130655a
Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`"
2017-06-20 07:56:48 +00:00
bcc5fc857a
Merge branch '33916-make-note-highlight-toggle-boolean-explcit' into 'master'
...
Fix note highlight being added when you don't have a URL fragment hash #note_xxx
Closes #33916
See merge request !12293
2017-06-20 07:45:28 +00:00
27664b7d9f
Merge branch '33877-fix-issue-description-highlight-and-math' into 'master'
...
Fix issue description syntax highlighting and math rendering
Closes #33877
See merge request !12282
2017-06-20 07:35:15 +00:00
f7ad9e5abb
Fix MR "Changes" diff note up arrow to edit last note
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33868
While in a MR "Changes" tab looking at some diff note discussions.
Clicking reply and pressing the up-arrow should edit your last comment in
that discussion.
I suspect this regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11173/diffs#f4bb984ec495c5cb58516785c62978f5209c39b4_179_178
where we changed the selector
2017-06-20 00:31:21 -05:00
19e12aac02
Fix note highlight being added to new notes
...
Always use a explicit true/false value to set highlight because jQuery
assumes `null` means toggle from whatever state and doesn't force false.
Regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
2017-06-19 18:52:19 -05:00
ef4bc6df04
Adjust position and wording for related issues in merge requests
2017-06-19 22:17:00 +00:00
Jose Ivan Vargas
Jacob Schatz
Clement Ho
Kushal Pandya
Winnie Hellmann
Sean McGivern
Douwe Maan
Mike Greiling
Tim Zallmann
Bryce Johnson
Luke "Jared" Bennett
Filipa Lacerda
Phil Hughes
Eric Eastwood
Grzegorz Bizon
Alfredo Sumaran
Pawel Chojnacki
Mike Greiling