547dc7ac60
Switch to Rails 5 by default
...
* updates Gemfile
* uses Rails 5 unless explicitly disabled
2018-11-14 12:38:30 +01:00
c93439605b
Merge branch '53816-empty-label-menu-if-not-logged-in' into 'master'
...
Resolve "Empty label menu if not logged in"
Closes #53816
See merge request gitlab-org/gitlab-ce!23042
2018-11-14 11:23:33 +00:00
a7a524d079
Merge branch 'revert-4ff91723' into 'master'
...
Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'"
See merge request gitlab-org/gitlab-ce!23020
2018-11-14 11:21:05 +00:00
a7192e2efc
Revert "Merge branch 'revert-drop-gcp-clusters-table' into 'master'"
2018-11-14 11:21:05 +00:00
7674a8f477
Merge branch 'fix-deployment-metrics-in-mr-widget' into 'master'
...
Avoid returning deployment metrics url to MR widget when the deployment is not successful
Closes #53870
See merge request gitlab-org/gitlab-ce!23010
2018-11-14 11:11:27 +00:00
1048ed4d86
Avoid returning deployment metrics url to MR widget when the deployment is not successful
2018-11-14 11:11:27 +00:00
f139ccf796
Merge branch '53922-sentry-errors-for-k8s-integration' into 'master'
...
Track Kubernetes errors using Sentry
Closes #53922
See merge request gitlab-org/gitlab-ce!23026
2018-11-14 11:10:36 +00:00
ba7cfdc2d7
Track Kubernetes errors using Sentry
2018-11-14 11:10:36 +00:00
70a18ed2cf
Removes promote to group label for anonymous user
2018-11-14 11:44:56 +01:00
dff3ded57f
Merge branch 'patch-31' into 'master'
...
Update comment in Auto-DevOps.gitlab-ci.yml
See merge request gitlab-org/gitlab-ce!23013
2018-11-14 10:22:00 +00:00
9d5d7c83e2
Merge branch 'add-documentation-for-git-operations-stack-trace' into 'master'
...
Adds documentation of git trace when git push/pull times out
See merge request gitlab-org/gitlab-ce!23016
2018-11-14 10:02:32 +00:00
db6913cb2e
Adds comma after "timings" in git troubleshooting documentation
2018-11-14 09:23:22 +00:00
f31aea1722
Merge branch '52940-fix-internal-email-pattern-not-respected' into 'master'
...
Fix a bug where internal email pattern wasn't respected
Closes #52940
See merge request gitlab-org/gitlab-ce!22516
2018-11-14 09:17:00 +00:00
bc72b2f181
Merge branch 'patch-31' into 'master'
...
Update events.md.
See merge request gitlab-org/gitlab-ce!23021
2018-11-14 08:13:15 +00:00
c1f2fa8e99
Merge branch 'add-prometheus-external-docs' into 'master'
...
Add docs for setting up external Prometheus
Closes #40949 and #37255
See merge request gitlab-org/gitlab-ce!22831
2018-11-14 08:06:33 +00:00
12d98ec0f0
Properly indent codeblocks
2018-11-14 09:00:43 +01:00
078fab665b
Merge branch '53972-fix-fill-shards' into 'master'
...
Fix a race condition in the shard population logic
Closes #53972
See merge request gitlab-org/gitlab-ce!23028
2018-11-13 23:05:08 +00:00
c718c6ee2a
Merge branch 'sh-bump-ruby-2.5.3' into 'master'
...
Upgrade to Ruby 2.5.3
Closes #41825
See merge request gitlab-org/gitlab-ce!22555
2018-11-13 22:51:05 +00:00
da521deb5f
Merge branch 'enable-image-comments-for-renamed-files' into 'master'
...
Fixed image commenting on moved files
See merge request gitlab-org/gitlab-ce!23023
2018-11-13 22:44:14 +00:00
a4729ffad5
Merge branch '53780-commit-discussion-ui' into 'master'
...
Fix broken UI on commit discussions
Closes #53780
See merge request gitlab-org/gitlab-ce!22952
2018-11-13 20:53:10 +00:00
6e84bfd4ae
Fix broken UI on commit discussions
2018-11-13 20:53:10 +00:00
c1ae5bc0bc
Incorporate feedback
2018-11-13 15:44:31 -05:00
3d1690c776
Fix a race condition intermittently breaking GitLab startup
2018-11-13 20:43:33 +00:00
132e6c9f95
Merge branch '53812-review-apps-check-whether-release-exists-before-attempting-stop_review' into 'master'
...
Ensure we abort the cleanup if release is empty
Closes #53812
See merge request gitlab-org/gitlab-ce!22992
2018-11-13 17:42:17 +00:00
fc7760636e
Merge branch '_acet-discussion-redesign-fixes' into 'master'
...
Border radius fixes for redesigned discussions
Closes #53880 and #53767
See merge request gitlab-org/gitlab-ce!23006
2018-11-13 17:27:22 +00:00
24971b5bd8
Merge branch '51259-tooltip' into 'master'
...
Updates ci header component with gitlab-ui
See merge request gitlab-org/gitlab-ce!23000
2018-11-13 17:09:36 +00:00
4383c7947e
Ensure we abort the cleanup if release is empty
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-13 18:01:46 +01:00
bb7ef68a31
Merge branch 'docs-jivl-update-monitoring-urls' into 'master'
...
Update URL for the grafana instance of sitespeed
See merge request gitlab-org/gitlab-ce!23001
2018-11-13 16:48:43 +00:00
42873a191f
Merge branch 'docs/update-prepend-documentation' into 'master'
...
Update docs to put prepend as the last line
Closes #53919
See merge request gitlab-org/gitlab-ce!23017
2018-11-13 16:16:06 +00:00
474ae41468
Merge branch 'winh-frontend-testing-categories-docs' into 'master'
...
Add documentation about frontend test categories to frontend guide
See merge request gitlab-org/gitlab-ce!21344
2018-11-13 16:15:03 +00:00
502d0b4d18
Merge branch 'docs-document_new_reports_syntax-ce' into 'master'
...
Document new report types
See merge request gitlab-org/gitlab-ce!22828
2018-11-13 16:09:10 +00:00
858d093bdc
Document new report types
2018-11-13 16:09:10 +00:00
73d3cb8c89
Fixed image commenting on moved files
2018-11-13 15:43:37 +00:00
2356f9ab25
Merge branch 'qa-auto-assign-codeowner-spec' into 'master'
...
Update merge request page object and selectors
See merge request gitlab-org/gitlab-ce!22939
2018-11-13 15:40:22 +00:00
9f5dfd59f1
Merge branch 'docs-eks-updates' into 'master'
...
Update eks guide to include admin token creation.
See merge request gitlab-org/gitlab-ce!22926
2018-11-13 15:25:18 +00:00
7d01c55084
Update eks guide to include admin token creation.
2018-11-13 15:25:18 +00:00
bf7e3372f9
Merge branch 'refactor-reference-regexes-and-identity-scopes' into 'master'
...
Refactor reference regexes and identity scopes
See merge request gitlab-org/gitlab-ce!22987
2018-11-13 14:52:16 +00:00
c6e704dd78
Updates ci header component with gitlab-ui
...
It reuses loading button instead of creating a new loading button
It uses the new gitlab-ui components
2018-11-13 09:47:00 -05:00
b9bd6a8a33
Update events.md.
...
"?" instead of "&" in request examples
2018-11-13 14:25:50 +00:00
1f5dca2d4f
Upgrade to Ruby 2.5.3
...
Attempt to update google-protobuf for migration-paths
Because the one we were using aren't compatible with
Ruby 2.5.3, and it'll be troublesome to switch Ruby.
Upgrading google-protobuf will be much easier.
All of them will need to be updated for Ruby 2.5.3
We remove oj because we don't really need it and it
doesn't compile on 2.5.3 with that version.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/41825
2018-11-13 06:17:46 -08:00
314bb5d1cf
Merge branch 'docs/fix-ordered-list-item-prefix' into 'master'
...
Resolve Markdown ordered lists not conforming to styleguide
See merge request gitlab-org/gitlab-ce!23007
2018-11-13 12:53:10 +00:00
fd52d05ef2
Merge branch 'archive-builds-documentation' into 'master'
...
Add documentation for archive builds
Closes #53534
See merge request gitlab-org/gitlab-ce!22909
2018-11-13 12:46:10 +00:00
5d16ee7b50
Merge branch 'kubernetes-http-response-code' into 'master'
...
Show HTTP response code for Kubernetes errors
Closes #53628
See merge request gitlab-org/gitlab-ce!22964
2018-11-13 12:46:01 +00:00
14b3033a0d
Show HTTP response code for Kubernetes errors
2018-11-13 12:46:01 +00:00
90c86b31c9
Make it explicit that we are referencing official Vue guidelines
2018-11-13 12:33:04 +00:00
bf91b06b1d
Update docs to put prepend as the last line
...
This updates the documentation for adding EE specific features to
clarify that `prepend` should be on the last line, and how to deal with
code that depends on class methods redefined in EE.
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/53919
2018-11-13 13:33:02 +01:00
921d867806
Replace "need not" with "don't"
2018-11-13 12:31:36 +00:00
1f0502df0a
Fix a bug where internal email pattern wasn't respected
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-11-13 13:24:53 +01:00
f2ef5e2ee8
Merge branch 'leipert-upgrade-node-yarn' into 'master'
...
Upgrade to node v10.x and yarn 1.12.x
See merge request gitlab-org/gitlab-ce!22979
2018-11-13 12:22:07 +00:00
9cebb1e490
Merge branch 'remove-mr-version-controls-form-fixed-width-container' into 'master'
...
remove .mr-version-controls from .fixed-with-container
See merge request gitlab-org/gitlab-ce!23003
2018-11-13 12:09:30 +00:00
Jan Provaznik
Rémy Coutable
Andreas Brandl
Kamil Trzciński
Shinya Maeda
Dylan Griffith
Jacopo
Douwe Maan
Tiago Botelho
Achilleas Pipinellis
Stan Hu
Filipa Lacerda
Fatih Acet
Annabel Dunstone Gray
Joshua Lambert
Nick Thomas
Phil Hughes
Clement Ho
Tim Zallmann
Olivier Gonzalez
Grzegorz Bizon
Daniel Gruesso
Robert Speicher
Viktor
Thong Kuah
Winnie Hellmann
Yorick Peterse