a442e34cde
Replace 'GKE' with 'Google Kubernetes Engine'
2018-04-17 12:59:31 +00:00
d26d4f9e33
Merge branch 'replace-build-permissions' into 'master'
...
Replace project builds permissions spinach with RSpec
See merge request gitlab-org/gitlab-ce!18306
2018-04-17 12:58:51 +00:00
e86923ebac
Merge branch '45436-markdown-is-not-rendering-error-loading-viewer-undefined-method-html_escape' into 'master'
...
Resolve "Markdown is not rendering, "Error loading viewer": undefined method `html_escape'"
Closes #45436
See merge request gitlab-org/gitlab-ce!18418
2018-04-17 12:53:01 +00:00
bcd89dcd1f
Merge branch 'sh-memoize-repository-empty' into 'master'
...
Memoize Git::Repository#has_visible_content?
See merge request gitlab-org/gitlab-ce!18383
2018-04-17 12:34:58 +00:00
2f3e74d82e
Merge branch 'blackst0ne-rails5-fix-ci-group-class-arel-table-error' into 'master'
...
[Rails5] Fix `undefined method 'arel_table' for Ci::Group:Class` error
See merge request gitlab-org/gitlab-ce!18329
2018-04-17 12:25:34 +00:00
423d0ba216
Merge branch 'tokiuji-update-proofreader.md' into 'master'
...
Add @tokiuji as Japanese proofreader
See merge request gitlab-org/gitlab-ce!18382
2018-04-17 12:03:21 +00:00
11ec2f7510
add changelog
2018-04-17 14:03:05 +02:00
7d200b6c2a
Merge branch '45406-error-getting-performance-bar-results-for-uuid-regularly-seen-in-production' into 'master'
...
Resolve ""Error getting performance bar results for [UUID]" regularly seen in production"
Closes #45406
See merge request gitlab-org/gitlab-ce!18419
2018-04-17 11:45:03 +00:00
478200aec4
Merge branch '43404-pipelines-commit' into 'master'
...
Resolve "Pipeline table breaks when commit is not found"
Closes #43404
See merge request gitlab-org/gitlab-ce!18379
2018-04-17 11:01:35 +00:00
d77db0adbd
Fix flash errors in performance bar for cached responses
...
When a request contains an ETag value in its If-None-Match header, the backend
may send a request ID (from Rack) that does not correspond to a value in Peek's
Redis cache (because we aborted the Rails processing in our ETag middleware).
Because a cached response (304) has to replace the headers with those from the
previous 200 - https://tools.ietf.org/html/rfc7234#section-4.3.4 - we add a
custom header that will only be present in cache hits, that can tell the
frontend to ignore these.
2018-04-17 11:50:27 +01:00
fe9c9ad2fe
Merge branch 'move-pipeline-failed-vue-component' into 'master'
...
Move PipelineFailed vue component
See merge request gitlab-org/gitlab-ce!18277
2018-04-17 10:29:44 +00:00
820b69941b
Merge branch 'bvl-report-recoverable-errors' into 'master'
...
Method to track recoverable exceptions in sentry
See merge request gitlab-org/gitlab-ce!18391
2018-04-17 10:18:20 +00:00
1a279fa9a9
Force content to align right
2018-04-17 11:02:05 +01:00
5f7f5eda92
Method to track recoverable exceptions in sentry
...
This adds a method to track errors that can be recovered from in
sentry.
It is useful when debugging performance issues, or exceptions that are
hard to reproduce.
2018-04-17 11:39:23 +02:00
cff44b5fb9
make call to 'html_escape' unambiguous
2018-04-17 11:39:11 +02:00
16e584c70a
Move PipelineFailed vue component
2018-04-17 12:28:22 +03:00
a18363e48e
Merge branch 'ide-subgroup-fix' into 'master'
...
Fixed web IDE not working for sub-groups
Closes #45412
See merge request gitlab-org/gitlab-ce!18404
2018-04-17 09:24:32 +00:00
f3e2deb352
fixed targetmode being included in project
2018-04-17 09:19:28 +01:00
eafa1b9fe3
Replace project builds permissions spinach with RSpec
...
https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
2018-04-17 11:04:20 +05:00
a56611e389
Merge branch 'docs-fe-vuex-header-hierarchy' into 'master'
...
FE Docs: Fix header hierarchy in Vuex section of Vue.md
See merge request gitlab-org/gitlab-ce!18413
2018-04-17 03:27:02 +00:00
c39ad568e4
Merge branch 'jramsay-ha-plugin-docs' into 'master'
...
Add note about HA configurations
See merge request gitlab-org/gitlab-ce!18354
2018-04-16 20:52:46 +00:00
4dc03de431
Merge branch 'jr-web-ide-core-docs' into 'master'
...
Web IDE is now GA
Closes #45307
See merge request gitlab-org/gitlab-ce!18403
2018-04-16 20:51:06 +00:00
46529246be
Merge branch '44853-add-rbac-flag-for-runner-chart-to-docs' into 'master'
...
Add RBAC flag for Runner chart to docs
Closes #44853
See merge request gitlab-org/gitlab-ce!18113
2018-04-16 20:49:48 +00:00
05375ee689
FE Docs: Fix header hierarchy in Vuex section of Vue.md
2018-04-16 20:39:58 +00:00
08083f43cb
Merge branch 'refactor/move-mr-widget-ready-to-merge-vue-component' into 'master'
...
Move ReadyToMerge vue component
See merge request gitlab-org/gitlab-ce!17545
2018-04-16 18:31:44 +00:00
41636097a5
Merge branch 'rs-database-mr-template' into 'master'
...
`package-qa` was renamed to `package-and-qa`
See merge request gitlab-org/gitlab-ce!18406
2018-04-16 18:22:45 +00:00
d5401cabea
Merge branch 'fl-reduce-test-tech-debt' into 'master'
...
Adds helpers to remove withespace and linebreaks
See merge request gitlab-org/gitlab-ce!18378
2018-04-16 18:01:10 +00:00
1cc633c8ec
Adds helpers to remove withespace and linebreaks
2018-04-16 18:01:09 +00:00
32bbe82ef8
`package-qa` was renamed to `package-and-qa`
...
[ci skip]
2018-04-16 12:45:24 -05:00
d103a567d6
Merge branch 'dz-update-permissions' into 'master'
...
Update permissions.md with guidance for developing new features
See merge request gitlab-org/gitlab-ce!18344
2018-04-16 17:03:31 +00:00
18097c1d4d
Merge branch 'fix_container_scanning_in_vendored_gitlab_ci_yml_for_auto_devops' into 'master'
...
Fix container scanning in vendored GitLab CI configuration for Auto Devops
See merge request gitlab-org/gitlab-ce!18374
2018-04-16 16:34:43 +00:00
07905c6916
Fix container scanning in vendored GitLab CI configuration for Auto Devops
2018-04-16 16:34:43 +00:00
671a204ccc
Merge branch '45397-update-faraday_middleware-to-0.12.2' into 'master'
...
Update faraday_middleware to 0.12.2
Closes #45397
See merge request gitlab-org/gitlab-ce!18397
2018-04-16 16:20:36 +00:00
82b6f82f71
Fixed web IDE not working for sub-groups
...
Closes #45412
2018-04-16 17:02:12 +01:00
8d2c01f83b
Remove web ide beta flag from docs and update
2018-04-16 11:54:21 -04:00
a1e4ee960a
Make the message break into a new line instead of truncating it
2018-04-16 16:52:15 +01:00
68f33e4277
Merge branch 'master' into 43404-pipelines-commit
...
* master: (124 commits)
Double-check next value for internal ids.
Resolve "skeleton placeholder on diff has white background"
Replace the `project/commits/comments.feature` spinach test with an rspec analog
Set ENV['IN_MEMORY_APPLICATION_SETTINGS'] to 'true in spec/db/production/settings_spec.rb
Update docs on `.gitlab-ci.yml` and variables policy
Add note about support of variables policy to docs
Revert and fix
corrected git cheat sheet url
Bump parser gem to 2.5.1.0 to remove warning in rspec
Update invalid test application_settings_controller_spec.rb
Use stable docker image instead of latest
Handle cancelled request
Stop polling and fetch the table
[ci skip] Updates table when stage is clicked
Backport GitLab domain helper methods
use jquery object in togglePopover
Fix other listeners
Fix the metrics link being not rendering the html
Fix feature_highlight listener
Update custom issue tracker docs
...
2018-04-16 16:42:52 +01:00
c1017ebf1b
Backport Web IDE docs to gitlab-ce
2018-04-16 11:38:03 -04:00
e5dbe4ca60
link to product handbook piece on permissions
2018-04-16 15:23:34 +00:00
ddd7a81d4f
Merge branch '45269-double-checked-internal-ids' into 'master'
...
Double-checked internal ID generation for transition phase
Closes #45269
See merge request gitlab-org/gitlab-ce!18392
2018-04-16 15:22:40 +00:00
5d6fb753ef
Merge branch 'fixing-url' into 'master'
...
corrected git cheat sheet url
See merge request gitlab-org/gitlab-ce!18385
2018-04-16 14:51:53 +00:00
6680b6beb4
Merge branch 'sh-bump-parser-gem' into 'master'
...
Bump parser gem to 2.5.1.0 to remove warning in rspec
See merge request gitlab-org/gitlab-ce!18384
2018-04-16 14:51:14 +00:00
cf7a3da4cc
Merge branch 'fix-doc-link' into 'master'
...
Use direct link rather than redirect for the 2F2 documentation page
See merge request gitlab-org/gitlab-ce!18273
2018-04-16 14:19:13 +00:00
87bbfa4d8b
Merge branch 'update-todos-docs' into 'master'
...
Added missing actions in todos docs
Closes #44803
See merge request gitlab-org/gitlab-ce!18247
2018-04-16 14:07:20 +00:00
af14cdc877
Merge branch 'docs/gb/add-support-note-to-variables-policy-docs' into 'master'
...
Add note about support of variables policy to docs
Closes #45301
See merge request gitlab-org/gitlab-ce!18387
2018-04-16 13:59:32 +00:00
4d3c75ab74
Update faraday_middlewar to 0.12.2
2018-04-16 21:49:35 +09:00
25cb70ba60
Merge branch 'ash.mckenzie/include-sha-with-version' into 'master'
...
Include git SHA with GitLab version on Admin Dashboard
See merge request gitlab-org/gitlab-ce!18331
2018-04-16 12:10:24 +00:00
14acbf2455
Double-check next value for internal ids.
...
This is useful for a transition period to migrate away from
`NoninternalAtomicId`. In a situation where both the old and new code to
generate a iid value is run at the same time (for example, during a
deploy different nodes may serve both versions), this will lead to
problems regarding the correct `last_value`. That is, what we track in
`InternalId` may get out of sync with the maximum iid present for
issues.
With this change, we double-check that and correct the `last_value` with
the maximum iid found in issues if necessary.
This is subject to be removed with the 10.8 release and tracked over
here: https://gitlab.com/gitlab-org/gitlab-ce/issues/45389
Closes #45269 .
2018-04-16 13:59:20 +02:00
4fcee58636
Merge branch 'ab-45247-project-lookups-validation' into 'master'
...
Validate project path prior to hitting the database.
Closes #45247
See merge request gitlab-org/gitlab-ce!18322
2018-04-16 11:18:39 +00:00
218b55dec9
Merge branch '40487-stop-polling' into 'master'
...
Resolve "Pipeline view stages showing incorrectly"
Closes #40487
See merge request gitlab-org/gitlab-ce!18254
2018-04-16 11:11:26 +00:00
Taurie Davis
Rémy Coutable
Sean McGivern
Grzegorz Bizon
Brett Walker
Phil Hughes
Sean McGivern
Filipa Lacerda
Bob Van Landuyt
George Tsiolis
Semyon Pupkov
Clement Ho
Marcia Ramos
Dennis Tang
Mike Greiling
Yorick Peterse
Robert Speicher
Dmitriy Zaporozhets
Robert Speicher
Gilbert Roulot
James Ramsay
🚄 Job van der Voort 🚀
Takuya Noguchi
Nick Thomas
Andreas Brandl