69cfdfaed3
Merge branch 'fe-header-row' into 'master'
...
Adds header column to variables list
Closes #46806
See merge request gitlab-org/gitlab-ce!28060
2019-05-08 08:30:03 +00:00
18dd29c0c3
Merge branch 'winh-notes-error-handling' into 'master'
...
Handle errors in successful notes reply
Closes #61377
See merge request gitlab-org/gitlab-ce!28082
2019-05-08 07:36:34 +00:00
3ad6653b3e
Added user time settings fields to profile
...
Udpated user_edit_profile_spec with time preferences
Minor update form fields
2019-05-07 21:58:16 +00:00
0625ccc652
Add failing test for saveNote error handling
2019-05-07 23:15:36 +02:00
78d3f94cee
Add custom metrics form to dashboard
...
Use existing form to allow users to add custom metrics via the dashboard
2019-05-07 17:46:33 +00:00
22f49d1656
Merge branch '60462-empty-pipeline-section' into 'master'
...
Fixes empty block in MR widget
Closes #60462
See merge request gitlab-org/gitlab-ce!27462
2019-05-07 15:37:50 +00:00
91acefb1f4
Merge branch '54405-resolve-discussion-when-applying-a-suggested-change' into 'master'
...
Resolve "Resolve discussion when suggestion is applied"
Closes #54405
See merge request gitlab-org/gitlab-ce!28160
2019-05-07 15:26:42 +00:00
3565ee2ed6
Add external dashboard link
...
Add settings for linking to external dashboard from
metrics dashboard
2019-05-07 14:47:09 +00:00
61cb27b01d
Fixes empty block in MR widget
...
This commit prevents the pipeline block to be rendered
when no pipeline information is provided
2019-05-07 16:39:02 +02:00
31861b0f05
Adds header column to variables list
...
For the variables list in CI/CD settings
this commits adds an header row with titles
2019-05-07 15:23:47 +01:00
06b06736eb
Merge branch 'winh-separate-frontend-fixtures' into 'master'
...
Generate EE-specific JavaScript fixtures into ee/ directory (CE-backport)
See merge request gitlab-org/gitlab-ce!28032
2019-05-07 07:45:42 +00:00
d24d77a93a
Resolve discussion when suggestion is applied
...
- Adds color and a tooltip to describe this new behavior
- Does not resolve if discussion is already resolved
- Adds an action `resolveDiscussion` to simplify `toggleResolveNote`
- Updates docs
https://gitlab.com/gitlab-org/gitlab-ce/issues/54405
2019-05-07 00:00:40 -05:00
ef440879f1
Merge branch '58105-pipeline-author-and-commit-author-too-close-together-in-pipeline-list' into 'master'
...
Improve pipelines table spacing, add triggerer column
Closes #38802 and #58105
See merge request gitlab-org/gitlab-ce!26136
2019-05-06 11:16:28 +00:00
08d1cc5c2a
Merge branch '59365-include-time-window-parameters-in-the-url-query-string' into 'master'
...
Resolve "Include time window parameters in the URL query string"
Closes #59365
See merge request gitlab-org/gitlab-ce!27230
2019-05-03 21:54:05 +00:00
5e1e9eb299
Separate tests for triggerer component
2019-05-03 11:21:04 -06:00
6daf4d352e
Merge branch 'expand-diff-performance' into 'master'
...
Impove the performance of expanding full diff
Closes #58597
See merge request gitlab-org/gitlab-ce!27413
2019-05-03 08:59:06 +00:00
9d24d4a8fd
Impove the performance of expanding full diff
...
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58597
2019-05-03 08:33:15 +01:00
6e3165f0b4
Load EE fixtures from ee/ directory in Karma
...
(cherry picked from commit 7cde57bf7367bce130a2e7f149c8dafd362de3f8)
2019-05-02 23:11:18 +02:00
5990d42253
Ignore PDF and balsamiq fixture files
...
(cherry picked from commit 1b33828811897b6a3f8a38044cc0839b87098d1f)
2019-05-02 23:11:12 +02:00
5432f5480f
Adds a way to start multiple manual jobs in stage
...
- Adds an endpoint on PipelinesController
- Adds a service that iterates over every build in a stage and
plays it.
- Includes 'play_manual' details on EntitySerializer
- Builds a new Stage state: PlayManual. An stage can take this status if
it has manual builds or an skipped, scheduled or manual status
- Includes FE modifications and specs
2019-05-02 18:27:35 +00:00
888840b6a3
Merge branch 'fix-ide-relative-url-bug' into 'master'
...
Fix IDE get file data with '/' as relative root
See merge request gitlab-org/gitlab-ce!27911
2019-05-02 13:45:45 +00:00
3e3bead22b
Make time window parameters available in the query string
...
This commit adds the frontend functionality to add the parameters
via the `pushState` api, preventing the need for a page reload.
2019-05-01 11:37:32 -05:00
911701ae47
Extract discussion notes into new component
...
- Moved discussion notes out of `NoteableDiscussion` component into a
new `DiscussionNotes` component
- Wrote Jest tests for the new `DiscussionNotes` component
- Updated Jest config for emojis fixtures
- Updated Karma tests `NoteableDiscussion` to match its new structure
- Convert `DiffDiscussions` tests to use Vue test utils
2019-05-01 10:04:07 +00:00
da443ff064
Merge branch 'winh-binary-fixture-path' into 'master'
...
Use FIXTURES_PATH constant for binary fixtures in frontend tests
See merge request gitlab-org/gitlab-ce!27891
2019-05-01 08:10:15 +00:00
29c5174274
Merge branch 'feat/sentry-environment' into 'master'
...
feat: add option to define the Sentry Environment
See merge request gitlab-org/gitlab-ce!27091
2019-04-30 18:27:27 +00:00
ee32e06f1f
Fix IDE get file data with '/' as relative root
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/60932
2019-04-30 13:09:40 -05:00
cba91e9a80
Merge branch 'refactor/58830-migrate-sidebar-spec-to-jest' into 'master'
...
refactor(sidebar): Refactored shared sidebar component tests to Jest
Closes #58830
See merge request gitlab-org/gitlab-ce!27688
2019-04-30 17:25:33 +00:00
aebb2f7025
feat: allow Sentry configuration to be passed on gitlab.yml
2019-04-30 18:10:57 +02:00
d89b19476d
Use FIXTURES_PATH for loading test.pdf
2019-04-30 12:40:45 +02:00
96ad838433
Use FIXTURES_PATH in balsamiq_viewer_integration_spec.js
2019-04-30 12:40:42 +02:00
5d5b9d57de
Merge branch '60476-actionview-missingtemplate-missing-template-projects-issues-_merge_requests-with-locale-en-formats-html-varian' into 'master'
...
Delete leftover code for referenced_merge_requests endpoint
Closes #60476
See merge request gitlab-org/gitlab-ce!27335
2019-04-30 00:34:49 +00:00
0af0e0fb1d
Merge branch 'winh-move-static-fixtures' into 'master'
...
Move all static fixtures to static directory
See merge request gitlab-org/gitlab-ce!27668
2019-04-26 14:36:23 +00:00
4848c32ea0
refactor(sidebar): Refactored Karma spec files to Jest
...
fix #58830
Added changelog
Updated to use jest functions
Added mock implementation
2019-04-26 14:54:20 +02:00
d1ac44ae96
Merge branch '60808-only-show-target-branch-advanced-error-before-merge' into 'master'
...
Don't show the "target branch advanced" error message after merge
Closes #60808
See merge request gitlab-org/gitlab-ce!27588
2019-04-26 08:30:59 +00:00
c4340c652b
Merge branch 'refactor/58827-migrate-issue-spec-to-jest' into 'master'
...
Migrated issue spec files to Jest
Closes #58827
See merge request gitlab-org/gitlab-ce!27673
2019-04-26 04:48:35 +00:00
d7b0dd8f7d
Merge branch 'migrate-import-projects-spec' into 'master'
...
Move import projects karma specs to jest
Closes #60204
See merge request gitlab-org/gitlab-ce!27552
2019-04-26 04:41:45 +00:00
642c7252d4
Move import projects karma specs to jest
...
Improvements to the stability/validity of the specs.
2019-04-25 19:59:44 +01:00
396dbbd415
refactor(issue): Refactored issue tests from Karma to Jest
...
re #58827
Added changelog
Added sync false, and removed unneeded destroyers
2019-04-25 16:33:40 +02:00
c005c97914
test(Refactored notes tests from Karma to Jest):
...
fix #58829
Added changelog entry
Added merge request id
2019-04-25 14:21:38 +00:00
d152a74ce3
Move all static fixtures to static directory
2019-04-25 13:56:32 +02:00
0f863c68bb
Merge branch '60687-enviro-dropdown' into 'master'
...
Fix Metrics environments dropdown
Closes #60687
See merge request gitlab-org/gitlab-ce!27586
2019-04-24 23:13:32 +00:00
045191628f
Merge branch 'fix-api-ide-relative-url-root' into 'master'
...
Fix API and IDE path with `/` relative_url_root
See merge request gitlab-org/gitlab-ce!27635
2019-04-24 22:50:55 +00:00
0edd8a6e93
Merge branch '60387-use-icons-in-user-popovers' into 'master'
...
Show category icons in user popover
Closes #60387
See merge request gitlab-org/gitlab-ce!27254
2019-04-24 19:55:14 +00:00
4abd436097
Fix API and IDE path with `/` relative_url_root
...
**Why?**
Previously we simply concatenated our paths, which led
to requesting `//api/v4/...` and obviously failed. The BE
supports a relative_url_root of `/`. It's a bug that the FE
does not.
2019-04-24 13:05:29 -05:00
ca6e946f0f
Only show message when MR is open
...
This commit fixes the bug that was causing the "target branch has
"advanced" error message to display after an MR was closed.
2019-04-24 12:19:15 -03:00
218430bdde
Create constants for IDE commit action values
...
**Why?**
These values will be used to help build the mirroring diff.
It is helpful keeping it controlled in a constant.
**Links:**
- https://gitlab.com/gitlab-org/gitlab-ee/issues/10232
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11478
2019-04-24 03:45:03 -05:00
e4d1f5d356
Fix Metrics environments dropdown
...
Also bring back EE dashboard component
2019-04-24 10:11:40 +10:00
314fbd4091
Fix issue with list label text color
2019-04-23 13:13:40 +00:00
d369d69240
Merge branch 'upgrade-to-rails-5-1' into 'master'
...
Upgrade Rails to 5.1
See merge request gitlab-org/gitlab-ce!27480
2019-04-23 12:05:17 +00:00
7dc2a7aa5b
Revert "Increased page size to 100"
...
This reverts commit 2869a61f3b
2019-04-23 07:42:58 +00:00
Phil Hughes
Fatih Acet
Ezekiel Kigbo
Winnie Hellmann
Adriel Santiago
Mayra Cabrera
Filipa Lacerda
Paul Slaughter
mfluharty
Jose Vargas
Paul Gascou-Vaillancourt
Douglas Barbosa Alexandre
Kushal Pandya
Roger Meier
Ash McKenzie
Clement Ho
Martin Hobert
Luke Bennett
Tim Zallmann
Nathan Friend
Simon Knox
Tucker Chapman
Rémy Coutable
Natalia Tepluhina