8152efbe2f
Remove instance_clusters feature_flag
...
Now we have terminals for instance and group clusters we can remove the
FF now. Deploying to instance clusters has been working without
complaints too.
2019-06-28 01:24:05 +12:00
3f759e1674
Remove group_clusters feature flag
...
Now we have terminals for instance and group clusters we can remove the
FF now. Deploying to group clusters has been working without complaints
too.
2019-06-28 00:28:03 +12:00
47089be063
Merge branch 'add-metrics-dashboard-permission-check' into 'master'
...
Add permission check to metrics dashboards
See merge request gitlab-org/gitlab-ce!30017
2019-06-27 10:54:30 +00:00
9c50cf03f5
Add permission check to dashboards
...
Adds permission checks to the metrics_dashboard endpoint. Users
with role of Reporter or above should have access to view the
metrics for a given project.
2019-06-27 10:54:29 +00:00
e7193f2356
Merge branch '12436-mr-widget' into 'master'
...
Removes EE differences for spec/javascripts/vue_mr_widget/mr_widget_options_spec.js
Closes gitlab-ee#12436
See merge request gitlab-org/gitlab-ce!30091
2019-06-27 10:00:21 +00:00
ab0c3e086f
Merge branch 'sh-add-gitaly-ref-caching-search-controller' into 'master'
...
Enable Gitaly ref caching for SearchController
See merge request gitlab-org/gitlab-ce!30105
2019-06-27 08:52:56 +00:00
80735a2d4b
Merge branch 'gt-fix-styling-for-framework-system-messages' into 'master'
...
Fix styling for `app/assets/stylesheets/framework/notes.scss`
Closes #59884
See merge request gitlab-org/gitlab-ce!26879
2019-06-27 08:30:06 +00:00
7544a6e259
Fix styling for `app/assets/stylesheets/framework/notes.scss`
2019-06-27 08:30:04 +00:00
edcd28ca44
Merge branch '54595-incorrect-reaction-emoji-placement-in-discussion' into 'master'
...
Fix incorrect reaction placement in commit diff discussion
Closes #54595
See merge request gitlab-org/gitlab-ce!29445
2019-06-27 07:42:19 +00:00
0e701c1304
Fix incorrect reaction placement in commit diff discussion
2019-06-27 07:42:18 +00:00
ec5137f65a
Merge branch 'update-toast-styling' into 'master'
...
Update toast action selector
See merge request gitlab-org/gitlab-ce!30024
2019-06-27 07:03:38 +00:00
08be6ed23b
Update action selector
...
Updated the toast action selector to `first-of-type` instead
2019-06-27 07:03:37 +00:00
547055db58
Merge branch 'qa-ml-unquarantine-add-file-template-tests' into 'master'
...
Unquarantine fixed tests
See merge request gitlab-org/gitlab-ce!30109
2019-06-27 06:19:14 +00:00
19cb764242
Merge branch 'mh/related-issues-design-ce' into 'master'
...
Conform related issues/MRs card to design docs
Closes #59594 and #61357
See merge request gitlab-org/gitlab-ce!29626
2019-06-27 06:12:39 +00:00
36d0dc083d
Conform related issues/MRs card to design docs
2019-06-27 06:12:38 +00:00
be099306ef
Merge branch 'rs-ee-only-routes-2' into 'master'
...
CE-EE parity for routes
See merge request gitlab-org/gitlab-ce!29994
2019-06-27 06:01:49 +00:00
fa54a486eb
Merge branch '53811-issue-boards-to-core-projects-backend-ce' into 'master'
...
Move Multiple Issue Boards for Projects to Core
See merge request gitlab-org/gitlab-ce!29757
2019-06-27 05:27:45 +00:00
54247af5a9
Merge branch '63588-follow-up-from-documentation-for-prometheus-service-discovery' into 'master'
...
Add note to collect CONSUL_SERVER_NODES in HA docs
Closes #63588
See merge request gitlab-org/gitlab-ce!29945
2019-06-27 05:17:01 +00:00
8e57a731d9
Unquarantine fixed tests
...
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/28915
2019-06-27 15:01:15 +10:00
038c38fec9
Merge branch 'docs/requirements_operating_system' into 'master'
...
Clarified supported operating systems
See merge request gitlab-org/gitlab-ce!30080
2019-06-27 03:32:20 +00:00
4c9e068224
Clarified supported operating systems
2019-06-27 03:32:19 +00:00
a08b42c2a6
Merge branch 'docs-markdown-link' into 'master'
...
Fix broken link in markdown doc
See merge request gitlab-org/gitlab-ce!30106
2019-06-27 01:41:06 +00:00
ee1838851b
Fix broken link in markdown doc
2019-06-27 01:41:05 +00:00
d5243f7262
Merge branch 'docs-autodevops-updates' into 'master'
...
Add zero downtime upgrade detail for production_replicas
See merge request gitlab-org/gitlab-ce!29912
2019-06-27 01:11:23 +00:00
5abf50cdd2
Add zero downtime upgrade detail for production_replicas
2019-06-27 01:11:22 +00:00
332193a3ee
Merge branch 'patch-71' into 'master'
...
docs: Update README.md. Made a simple grammar fix.
See merge request gitlab-org/gitlab-ce!30065
2019-06-27 00:35:34 +00:00
924d7aff26
Merge branch '61156-instance-level-cluster-pod-terminal-access' into 'master'
...
Instance-level cluster pod terminal access
Closes #55489 , #55488 , #55487 , and #61156
See merge request gitlab-org/gitlab-ce!28613
2019-06-27 00:30:17 +00:00
d7fa6d13cd
Merge branch 'docs-gfm-cleanup' into 'master'
...
Docs: GFM Doc Refactor
Closes #12681 , #52394 , #56148 , #58676 , #50138 , and #52250
See merge request gitlab-org/gitlab-ce!27265
2019-06-27 00:28:39 +00:00
e1c6f4334f
Markdown doc refactor - squashed
...
Change emoji to Gitlab rendering and fix typo
Use built in renderer for math
Touchups to GFM Doc and bring in suggestions from MR 22122
Fix link
Add epics to align docs
Add epic badge
Fix dashes making accidental headers, and move wikis down, add emoji note
Add section explaining GitLab markdown extensions
Update to incorporate recent changes
Add links rendering, fix issue rendering as color chip
Add links rendering, fix issue rendering as color chip
Update links to GitLab rendered version of markdown doc
Separate GFM extensions, reorder list, other tweaks
Update code blocks and highlighting
Trying to fix improper markdown rendering
Fix rendering broken by triple backticks and add emoji note
testing triple tildes instead of quad backticks
testing rending after mermaid
Various fixes to improve markdown rendering
Update markdown doc after review
Fix markdown doc after review, part two
fix typo in markdown doc
2019-06-27 00:28:39 +00:00
df35126855
Merge branch 'sh-update-mermaid' into 'master'
...
Update Mermaid to 8.1.0
Closes #60869
See merge request gitlab-org/gitlab-ce!30036
2019-06-27 00:27:06 +00:00
e688f3db66
Merge branch 'dz-remove-deprecated-user-routes' into 'master'
...
Remove deprecated user routes
See merge request gitlab-org/gitlab-ce!30044
2019-06-27 00:13:01 +00:00
ee791d3f40
Enable Gitaly ref caching for SearchController
...
As we noticed in
https://gitlab.com/gitlab-org/gitlab-ce/issues/56627#note_185828742 ,
clicking on the "Issues" tab often requests the same reference in
rendering Markdown.
2019-06-26 16:24:46 -07:00
6f44b8fcda
Merge branch 'docs/sidekiq-cluster' into 'master'
...
Clean up the Sidekiq cluster docs
See merge request gitlab-org/gitlab-ce!28831
2019-06-26 23:24:34 +00:00
13d8992006
Merge branch 'rj-fix-spec' into 'master'
...
Use relative position to order issues
See merge request gitlab-org/gitlab-ce!30095
2019-06-26 23:04:26 +00:00
c95b671b89
Merge branch '63247-add-conf-toast-and-link' into 'master'
...
Resolve "Including a link to the posted comment for visual review app review feature"
Closes #63247
See merge request gitlab-org/gitlab-ce!29719
2019-06-26 22:53:06 +00:00
63fdd2c60d
Basic note appears
...
This happens in multiple files
2019-06-26 22:53:05 +00:00
054f869f6b
Add note to collect CONSUL_SERVER_NODES in HA docs
...
There are several instances in our HA docs where an example of
`Y.Y.Y.Y consul1.gitlab.example.com Z.Z.Z.Z` is given,
but this value isn't explicitly stated. It should be
the IP addresses or DNS records of the Consul server nodes.
2019-06-26 17:39:58 -05:00
0f045c4239
Merge branch 'i18n-access_tokens-of-user-profile' into 'master'
...
Externalize strings of access tokens page in user profile
See merge request gitlab-org/gitlab-ce!28635
2019-06-26 22:36:56 +00:00
ce8cf72b8e
Externalize strings of access tokens page in user profile
2019-06-26 22:36:55 +00:00
23f5dcf648
Merge branch '59974-multidash' into 'master'
...
Load dashboards from project's git repository
Closes #59974
See merge request gitlab-org/gitlab-ce!29348
2019-06-26 22:14:42 +00:00
27afe5496d
Add feature flag and dashboard endpoint
...
First part of FE for Prometheus API
Dashboard endpoint fetches all info except for chart results
Renders empty groups after loading
2019-06-26 22:14:41 +00:00
25b3d905a0
Properly check that issue list has persisted
...
A valid user needs to be signed in, and we need to reload the page to
verify that the issue list was saved on the backend.
2019-06-26 14:51:53 -07:00
871d06993e
Merge branch '62765-add-jquery-to-jest-setup' into 'master'
...
Add jQuery in jest test_setup
See merge request gitlab-org/gitlab-ce!30100
2019-06-26 20:17:57 +00:00
ee6fb858fd
Add jQuery to jest test_setup
2019-06-26 13:48:01 -05:00
8c28c3e84e
Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'
...
Remove Sentry settings from application settings
See merge request gitlab-org/gitlab-ce!28447
2019-06-26 18:24:14 +00:00
62a5a6b621
Use relative position to order issues
2019-06-26 22:20:45 +05:30
2b00b61eba
Update CHANGELOG.md for 11.11.4
...
[ci skip]
2019-06-26 16:38:41 +00:00
8e42fe9450
Delineate additional EE-only routes
2019-06-26 11:29:41 -05:00
2d738b6f84
Copy routes from EE
...
This ensures all routes are defined in both CE and EE, with EE-specific
routes being wrapped in `Gitlab.ee` blocks.
2019-06-26 11:29:41 -05:00
5ec2146c4a
Add Gitlab.ee method
...
This method yields to the given block when the installation is EE.
2019-06-26 11:29:41 -05:00
Thong Kuah
Rémy Coutable
Sarah Yasonik
Phil Hughes
Kamil Trzciński
George Tsiolis
Samantha Ming
Kushal Pandya
Jacques Erasmus
Ramya Authappan
Martin Hanzel
Lin Jen-Shin
Stan Hu
Achilleas Pipinellis
Mark Lapierre
Evan Read
Russell Dickenson
Marcel Amirault
Daniel Gruesso
Ray Paik
Marcel Amirault
Fatih Acet
Mike Greiling
Sarah Groff Hennigh-Palermo
Cindy Pallares
antony liu
Simon Knox
Paul Slaughter
Rajat Jain
GitLab Release Tools Bot
Robert Speicher