46fdec84dd
Extend timezone dropdown
...
Adds optional paramters to the constructor to allow
reuse of the timezone dropdown on other pages
2019-04-03 08:27:16 +00:00
a374d690e7
Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'
...
Fixes duplicate diff too large error messages
Closes #59802
See merge request gitlab-org/gitlab-ce!26857
2019-04-03 08:05:52 +00:00
2378dde2e2
Remove non-functional add issue button on welcome list
2019-04-02 20:23:23 +00:00
eebf24ead5
Fixes duplicate diff too large error messages
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
2019-04-02 13:24:36 +01:00
69b65a6b74
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into jarv/dev-to-gitlab-2019-04-02
2019-04-02 10:12:32 +02:00
02dcecdb5f
Merge branch 'security-55503-fix-pdf-js-vulnerability' into 'master'
...
Fix PDF.js vulnerability
See merge request gitlab/gitlabhq!2999
2019-04-02 07:48:26 +00:00
e3465a5dde
Add jQuery matchers to Jest
2019-04-01 18:55:57 +00:00
f87ff7af53
Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'
...
Fix bug where clicking file header in diff refreshes page
Closes #57669
See merge request gitlab-org/gitlab-ce!26422
2019-04-01 15:28:37 +00:00
a9441396da
Scroll to diff file when clicking on file name
...
- Add an ID to the diff content
- handle clicking on file name in diffFileHeader when it is not a link
to another page but rather a link to an element on the page
2019-03-29 14:56:53 -04:00
b4cc639f80
Merge branch 'winh-jest-html-fixtures' into 'master'
...
Add helpers for HTML fixtures to Jest
Closes #57998
See merge request gitlab-org/gitlab-ce!26739
2019-03-29 16:59:16 +00:00
f4b8ec7ea1
Add requested resources to cluster health - ce port
2019-03-29 08:33:10 +00:00
7a7866a54a
Move abuse_reports_spec.js to Jest
2019-03-29 07:33:30 +01:00
335c925d93
Merge branch '9957-move-ee-differences-for-app-assets-javascripts-monitoring-components-dashboard-vue-ce' into 'master'
...
Remove EE differences for monitoring dashboard
See merge request gitlab-org/gitlab-ce!26574
2019-03-28 10:08:25 +00:00
89fdf64c8a
Revert "Merge branch '13784-validate-variables-for-masking' into 'master'"
...
This reverts merge request !25476
2019-03-27 21:42:23 +00:00
4f0b2079de
Upgraded Vue to 2.6.8
...
Upgrade to latest Version
2019-03-27 21:33:20 +00:00
fc8f4b62f8
Scaffold UI elements for minimal version
...
Add a masked switch to variable rows
Copy some behavior from the protected switch
2019-03-27 19:13:55 +00:00
3bdb761dc2
Merge branch '10719-stage-spec' into 'master'
...
Removes EE differences for stage_column_component_spec
Closes gitlab-ee#10719
See merge request gitlab-org/gitlab-ce!26659
2019-03-27 14:40:28 +00:00
6a905e8e58
Merge branch 'winh-cleanup-note_form_spec' into 'master'
...
Remove top-level mount from note_form_spec.js
Closes #59114
See merge request gitlab-org/gitlab-ce!26616
2019-03-27 14:37:17 +00:00
e081c0cba2
Removes EE differences for stage_column_component_spec
2019-03-27 12:49:01 +00:00
0610bb0917
Merge branch 'winh-assignees_spec' into 'master'
...
Copy missing test in assignees_spec.js from EE
Closes gitlab-ee#6641
See merge request gitlab-org/gitlab-ce!26618
2019-03-27 09:04:49 +00:00
fc247b15f0
Merge branch 'remove-expand-diff-feature-flag' into 'master'
...
Remove expand diff to full file feature flag
See merge request gitlab-org/gitlab-ce!26614
2019-03-27 09:02:18 +00:00
535bd5743f
Merge branch '48132-display-output-from-pre-receive-scripts' into 'master'
...
Allow custom hooks errors to appear in GitLab UI
Closes #48132
See merge request gitlab-org/gitlab-ce!25625
2019-03-26 22:33:25 +00:00
4cdef3da6c
Copy missing test in assignees_spec.js from EE
2019-03-26 20:23:19 +01:00
4d1ac56518
Remove top-level mount from note_form_spec.js
2019-03-26 19:53:07 +01:00
3b158409b3
Remove expand diff to full file feature flag
2019-03-26 18:20:02 +00:00
01c40ae29f
Merge branch 'dm-md-css' into 'master'
...
Untangle Markdown/Diffs/Notes CSS mess
See merge request gitlab-org/gitlab-ce!26493
2019-03-26 16:40:25 +00:00
ad985a7a28
Merge branch 'winh-remove-sushi' into 'master'
...
Remove .raw from JavaScript fixture file names
Closes #59201
See merge request gitlab-org/gitlab-ce!26430
(cherry picked from commit 79a45f7f02
2019-03-26 16:03:28 +00:00
c02b60261c
Remove EE differences for monitoring dashboard
2019-03-27 00:55:04 +11:00
40e3f207cb
Remove now-unnecessary noteable_line class
2019-03-26 14:37:14 +01:00
63792707f9
Remove now-unnecessary md-preview class
2019-03-26 14:35:43 +01:00
838f7e56a4
Remove .wiki and @md-typography mixin in favor of .md and .md-file
...
Before, the styling for `img:not(.emoji)`` was repeated between
`.md:not(.use-csslab):not(.wiki)` (for comments and the Markdown
preview), `.documentation.wiki` (for help pages), and
`.issuable-details .description .wiki` (for MR and issue descriptions).
In these places, we now simply use `.md`. Wherever we use `.md` but
don't want this image styling (like wikis and blobs), `.md-file` is
added.
2019-03-26 14:29:33 +01:00
76d281881a
Allow runners to be installed on group clusters
...
A runner installed on a cluster will now use the
cluster's `cluster_type` as its `runner_type`.
2019-03-26 09:59:48 +00:00
cafdb3e430
Merge branch 'jivl-replace-environments-dropdown-with-gitlab-ui-dropdown-master' into 'master'
...
Replace environments dropdown with gitlab ui dropdown
See merge request gitlab-org/gitlab-ce!26386
2019-03-26 08:39:50 +00:00
22f2879b9b
Merge branch 'MaxWinterstein-unify-copy-comit-sha' into 'master'
...
Unify behaviour of 'Copy commit SHA to clipboard' on job view
Closes #58343
See merge request gitlab-org/gitlab-ce!25829
2019-03-26 00:55:02 +00:00
f82380b9df
Allow custom hooks errors to appear in GitLab UI
...
Error messages from custom pre-receive hooks now appear in the GitLab
UI.
This is re-enabling a feature that had been disabled in merge request
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18646
The feature had been disabled due to security concerns that information
which was not intended to be public (like stack traces) would leak into
public view.
PreReceiveErrors (from pre-receive, post-receive and update custom
hooks) are now filtered for messages that have been prefixed in a
particular way.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48132
2019-03-26 13:05:40 +13:00
a72241f4a9
Fixed commit logic to pick a branch
...
- fixed getter spec with correct getter name
2019-03-25 09:16:41 +00:00
514ee63826
Move some tests from Karma to Jest
2019-03-23 17:53:46 +01:00
022968764c
Revert "Merge branch 'winh-remove-sushi' into 'master'"
...
This reverts merge request !26430
2019-03-22 11:03:15 +00:00
e14b4b051e
Merge branch '57540-filename-trailing-space' into 'master'
...
Implemented trimming for item's name in Web IDE
Closes #57540
See merge request gitlab-org/gitlab-ce!26270
2019-03-22 09:38:35 +00:00
f6772ffb1a
Merge branch '57357-automate-base-domain-help-text' into 'master'
...
Automate base domain help text on Clusters page
Closes #57357
See merge request gitlab-org/gitlab-ce!26124
2019-03-22 07:23:02 +00:00
9618f419f2
Merge branch 'winh-toggle-comment-draft' into 'master'
...
Display draft when toggling replies
Closes #48211 and #56364
See merge request gitlab-org/gitlab-ce!25563
2019-03-22 07:18:42 +00:00
79a45f7f02
Merge branch 'winh-remove-sushi' into 'master'
...
Remove .raw from JavaScript fixture file names
Closes #59201
See merge request gitlab-org/gitlab-ce!26430
2019-03-21 19:46:55 +00:00
70c13de9b1
Change environments dropdown to use gitlab-ui
2019-03-21 13:45:12 -06:00
3e9bb4ad31
Remove .raw from JavaScript fixture file names
...
There is nothing more to say but
"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"
2019-03-21 17:16:53 +01:00
53e23a296d
Pass autosaveKey from NoteableDiscussion to NoteForm
2019-03-21 17:14:44 +01:00
93c27c3b22
Validate NoteForm props in noteable_discussion_spec.js
2019-03-21 17:14:44 +01:00
f5ce678dfe
Use autosave utilities in NoteForm component
2019-03-21 17:14:44 +01:00
7e6b57499f
Update merge request widget pipeline block
...
This commit updates the pipeline block that appears on the merge request
page to include information that will be exposed by the API as part of
the post-merge pipeline feature.
2019-03-21 15:31:09 +00:00
43ca72689a
Update domain help text when ingress is installed
...
When ingress application is installed, the cluster domain help text
is updated to indicate that ingress external ip can be used as the
cluster domain
2019-03-21 11:25:11 -04:00
6811f1aca5
Merge branch 'nfriend-update-job-detail-view-sidebar' into 'master'
...
Update job detail view sidebar to accommodate post-merge pipelines
See merge request gitlab-org/gitlab-ce!25777
2019-03-21 10:34:57 +00:00
Ezekiel Kigbo
Filipa Lacerda
Donald Cook
Phil Hughes
John Jarvis
GitLab Release Tools Bot
Winnie Hellmann
Clement Ho
Sam Bigelow
Tristan Read
Kamil Trzciński
Tim Zallmann
Miranda Fluharty
Fatih Acet
Dmitriy Zaporozhets
Annabel Dunstone Gray
Simon Knox
Douwe Maan
Tiger Watson
Luke Duncalfe
Natalia Tepluhina
Kushal Pandya
Mike Greiling
Jose Vargas
Nathan Friend
Enrique Alcantara