Commit Graph

3937 Commits

Author SHA1 Message Date
Fatih Acet 396379d8f0 Merge branch 'winh-notes_spec-timeout' into 'master'
Increase timeout for notes_spec.js

See merge request gitlab-org/gitlab-ce!27270
2019-04-11 22:18:18 +00:00
Winnie Hellmann 4cbca33862 Increase timeout for notes_spec.js 2019-04-11 15:08:53 +02:00
Winnie Hellmann 2f704d8356 Delete static_fixtures.rb for static HAML fixtures 2019-04-11 07:39:14 +00:00
Tim Zallmann c57529556c Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"
Reverts the loading of emojis and its images to move forward with RC
2019-04-10 11:49:06 -07:00
Nick Thomas a6218f1bcd Merge branch 'osw-multi-assignees-merge-requests' into 'master'
[Backport] Support multiple assignees for merge requests

See merge request gitlab-org/gitlab-ce!27089
2019-04-09 15:19:36 +00:00
Sarah Yasonik 193e660291 Resolve Environments#additional_metrics TypeError, ensure unix format 2019-04-09 09:54:17 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Enrique Alcántara be8997ca7c Migrate clusters tests to jest
Move cluster applications manager tests from karma to jest. Fixes
some migration issues related with timeouts, and HTTP request
expectations.
2019-04-08 07:31:27 +00:00
Luke Bennett 97b8853d61
Move karma serverless tests to jest for isolation
These tests cause master failures because of an overflow
in vue-test-utils sync watcher setup.
2019-04-07 12:25:06 +01:00
Kushal Pandya 8f37215277 Merge branch '_acet-related-mrs-widget-rewrite' into 'master'
Rewrite related MRs widget with Vue

Closes #58926 and #57662

See merge request gitlab-org/gitlab-ce!27027
2019-04-07 02:36:21 +00:00
Chris Baumbauer b77fe7db3e Add Knative metrics to Prometheus 2019-04-06 02:02:39 +00:00
Clement Ho 23df40f99f Merge branch '31368-support-different-time-windows-for-performance-dashboard' into 'master'
Resolve "Support different time windows for performance dashboard"

Closes #31368

See merge request gitlab-org/gitlab-ce!26047
2019-04-05 22:18:11 +00:00
Adriel Santiago 8cf0af88e6 Wrap long chart tooltip series label names
Resolves an issue where long series label names overflow
the popover chart tooltip container
2019-04-05 21:59:57 +00:00
Sarah Yasonik f44737e453 Support multiple queries per chart on metrics dash
Adding support for metrics alerts disabled multiple query support.
To avoid a data model refactor, this enables the visual of multiple
queries per chart on the front end, combining queries based on
metric group, title, and y-axis label.

This also adds support for adding and editing alerts based on the
query selected rather than the single metric associated with the chart.
2019-04-05 20:41:31 +00:00
Enrique Alcántara 8906de3720 Do not display ingress IP help text
if there isn’t an ingress IP assigned for the cluster yet
2019-04-05 20:35:23 +00:00
Fatih Acet 7650677d3d
Rewrite related MRs widget with Vue
This MR rewrites existing Related Merge Requests widget
with Vue with reusing shared Related Issues components
2019-04-05 21:20:28 +02:00
Sam Bigelow bf47270e90 Improve diff navigation header
- Compare versions header is full width except in the unified diff mode
with no tree sidebar
  - Bar is always full width, but the content within stays centered when
unified and no tree sidebar
- File header is the same height as the "Compare versions header"
- aligns with the design system grid guidelines => 56px
- Diff file headers use a button group, switch icon order to open file
externally being the last option, all buttons will become icon buttons
(icon delivery by @dimitrieh)
- If a file header becomes sticky no rounded corner/double border
problem is visible anymore
2019-04-05 14:57:01 -04:00
Mike Greiling 361c7ca697 Merge branch 'winh-ee-environment-variable' into 'master'
Rename environment variable EE to IS_GITLAB_EE

Closes #60080

See merge request gitlab-org/gitlab-ce!27044
2019-04-05 18:51:50 +00:00
Filipa Lacerda 941e00121c Merge branch 'ce-9262-move-project-search-bar-into-modal-dialog-on-operations-dashboard-page' into 'master'
CE backport: Add reusable project_selector component

See merge request gitlab-org/gitlab-ce!25036
2019-04-05 16:25:45 +00:00
Phil Hughes 66699030ef Merge branch '57482-shortcut-to-create-merge-request-from-web-ide' into 'master'
Resolve "Shortcut to create merge request from Web IDE"

Closes #57482

See merge request gitlab-org/gitlab-ce!26792
2019-04-05 13:48:25 +00:00
Phil Hughes 9fb1dfa870 Merge branch '57668-create-file-from-url' into 'master'
Resolve "Support creating new file from URL in the Web IDE"

Closes #57668

See merge request gitlab-org/gitlab-ce!26622
2019-04-05 13:41:03 +00:00
Sean McGivern 934dabaf6d Merge branch 'keyval-labels' into 'master'
[CE] Add mutually exclusive labels

See merge request gitlab-org/gitlab-ce!26804
2019-04-05 10:28:19 +00:00
Winnie Hellmann 64e9cf00a7 Rename environment variable EE to IS_GITLAB_EE 2019-04-05 12:08:05 +02:00
Phil Hughes 36d1d9082c Merge branch '60021-fix-ide-file-dropdown' into 'master'
Fix IDE file dropdown

Closes #60021

See merge request gitlab-org/gitlab-ce!27015
2019-04-05 07:39:40 +00:00
Paul Slaughter 59ac0924da Fix IDE detecting MR from fork branch
**Why?**
Currently the IDE loads a merge request based on only the
`source_branch` name. This means it loads MR's from
forks that have the same branch name (not good).

- This required updating the BE API to accept `source_project_id`
2019-04-05 07:29:53 +00:00
Grzegorz Bizon ff64887964 Merge branch '54506-show-error-when-namespace-svc-missing' into 'master'
Show error when namespace/svc account missing

Closes #54506

See merge request gitlab-org/gitlab-ce!26362
2019-04-05 07:05:32 +00:00
Jose Vargas 976f1feb28 Document getTimeDifferenceMinutes usage
Also added a finally clause to the getGraphsDataWithTime promise
2019-04-04 14:53:03 -06:00
Jose Vargas a6f9f79b73 Changed the feature flag usage
In order for the dashboard component not to fail, the feature flag
is now required by default
2019-04-04 14:53:03 -06:00
Jose Vargas 217e9e4db1 Created `getTimeDiff` utility function
Updated i18n strings and changed the
monitoring service graph data params
2019-04-04 14:53:03 -06:00
Jose Vargas b75e03a6c9 Update translation files 2019-04-04 14:53:03 -06:00
Jose Vargas 481d25bf48 Add feature flag
Also added relevant tests that make use of a stubbed feature flag,
prettified files
2019-04-04 14:53:03 -06:00
Jose Vargas f77ff0c7bd Add support for time windows for the performance dashbooards
The performance dashboards will now display the data
from a set amount of time windows that are defined
on a constants file
2019-04-04 14:53:03 -06:00
Paul Slaughter c1a097e1ce
Refactor new_dropdown/index to receive isOpen prop
**Why?**

Previously it managed this as an internal data property, but there
was extra complexity involved because the component doesn't have
all the information it needs (i.e. the `mouseOver` prop).

This is a good opportunity to colocate the data prop with the component
that has the information to change it (i.e. `file_row`) and let
`new_dropdown/index` receive this value as a prop.
2019-04-04 15:35:45 -05:00
Sam Bigelow 2571856fc5 Shortcut to create MR in web IDE
Before the user had to choose between committing to a new branch,
committing to a new branch AND creating an MR, or committing to the
current branch regardless of whether or not it already has an MR.

This commit separates the creation of an MR from whether or not they
commit to an existing or new branch
2019-04-04 12:08:35 -04:00
Paul Slaughter bd1122ee2f
Fix vue render error for IDE status bar
**What?**

A Vue warning that `ide_status_bar` sent a `Boolean` to a `String`
property (`img-src).

**What was the fix?**

Previously, `latestPipeline` could be one of the following values:

|          |        |
|----------|--------|
| `null`   | The pipeline hasn't loaded yet |
| `false`  | The pipeline has loaded, but nothing was returned. |
| `Object` | The piepline has loaded. |

Giving a semantic meaning to different falsey values hurts
maintainability. This commit fixes the above problem by removing the
`false` value and introducing a `hasLoadedPipeline` state property.
2019-04-04 10:00:44 -05:00
Oswaldo Ferreira e540c0d71e Fixed test specs
- added suggestions to mock data
- fixed props to be not required
2019-04-04 13:08:34 +00:00
Winnie Hellmann 52515dda0b Copy sidebar todo component from EE 2019-04-04 08:21:27 +00:00
Denys Mishunov 5e0423ebc5 Set tree list accounting for already-opened files
Since we can create files from URL now, this means that these files will
not exist in the tree returned from API: they exist on the client
only before the first commit. In order to still show the newly-created
files in the tree, we should not override the tree, but merge the tree
existing on the client and the one coming from API.

Changelog entry

Moved trees merging into mutation
2019-04-04 09:05:50 +02:00
Denys Mishunov f6a038b38a Create a new file if URL references non-existent one 2019-04-04 09:05:50 +02:00
Rajat Jain 97ab853996 [frontend] backport of scoped labels
Scoped labels in EE require additional changes in CE code.
2019-04-04 08:06:48 +02:00
Mike Greiling 6202820c16 Merge branch '29249-show-download-diff-even-when-merge-request-is-closed' into 'master'
Resolve "Show download diff even when merge request is closed"

Closes #29249

See merge request gitlab-org/gitlab-ce!26772
2019-04-03 18:42:31 +00:00
Clement Ho 3de4399406 Merge branch '13784-validate-variables-for-masking' into 'master'
Simple masking frontend - CE

See merge request gitlab-org/gitlab-ce!26751
2019-04-03 17:55:56 +00:00
Nick Thomas db12e729a7 Merge branch '58644-remove-reply_to_individual_notes-feature-flag' into 'master'
Remove reply_to_individual_notes feature flag

Closes #58644

See merge request gitlab-org/gitlab-ce!26889
2019-04-03 13:54:05 +00:00
Ezekiel Kigbo 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
Filipa Lacerda 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
mfluharty eb95100c06
Make corrections to address review feedback
Refactor tests to follow conventions
Add XSS test
Eliminate a few unnecessary lines, comments, and parameters
Use Vue.set for nested state changes
2019-04-02 23:58:20 -06:00
Nathan Friend 06b88af046
Add reusable project_selector component
This commit adds a resuable UI component that allows a user to search
for a project name, shows the search results, and allows the user to
select one or more projects.  This component communicates with its
parent using props and events.

This component was originally created for use in the EE-specific
"Operations Dashboard" page, but it is applicable for CE use cases as
well, and so was added as a CE shared component.

In addition, some logic was extracted from the frequent_items_list_item
component into shared filters to avoid logic duplication.
2019-04-02 23:58:01 -06:00
Heinrich Lee Yu c17b7afa02 Remove reply_to_individual_notes feature flag
Also removes specs related to the flag
2019-04-03 10:00:18 +08:00
Fatih Acet 4e5fc1949f
Show Download diff links in closed MRs
Download MR diffs links were only available for open MRs,
however it may still be useful for closed MRs.
2019-04-03 01:33:12 +02:00
Donald Cook 2378dde2e2 Remove non-functional add issue button on welcome list 2019-04-02 20:23:23 +00:00