9982ff3f99
Prefer using direct links in docs styleguide
2018-07-25 09:26:47 +02:00
83a6438002
Merge branch 'sh-add-frozen-literal-templates' into 'master'
...
Add frozen_string_literal to migration templates
See merge request gitlab-org/gitlab-ce!20829
2018-07-25 07:02:19 +00:00
4bbfe53175
Merge branch 'using-docker-build-docs' into 'master'
...
Update doc/ci/docker/using_docker_build.md
Closes #48691
See merge request gitlab-org/gitlab-ce!20426
2018-07-25 06:49:56 +00:00
4495abcd8c
Update doc/ci/docker/using_docker_build.md
2018-07-25 06:49:56 +00:00
05cb559d85
Add frozen_string_literal to migration templates
...
Part of #47424
2018-07-24 21:43:42 -07:00
6cb30f8325
Merge branch 'mk/add-example-output-for-check-task-docs' into 'master'
...
Add example output for file integrity check rake task
Closes #49244
See merge request gitlab-org/gitlab-ce!20825
2018-07-24 23:34:41 +00:00
309a3f1477
Merge branch 'fix-gitlab-registry-ssl-redirect' into 'master'
...
Fix: redirect non-SSL request for gitlab registry to valid URL
See merge request gitlab-org/gitlab-ce!20824
2018-07-24 23:24:06 +00:00
bbccf17a5e
Add example output for file integrity check
2018-07-24 16:17:57 -07:00
23f705f2d0
Fix: redirect non-SSL request for gitlab registry to valid URL
...
HTTP host and URI should not be separated by a colon. Generated URLs was looking like http://registry.examples.com:/foo . That is throwing up let's encrypt cert requests for gitlab registry.
2018-07-24 22:42:23 +00:00
d114800241
Merge branch 'sh-revert-markdown-changes' into 'master'
...
Fix slow Markdown rendering
Closes #49409
See merge request gitlab-org/gitlab-ce!20820
2018-07-24 20:34:16 +00:00
be495c6a80
Fix slow Markdown rendering
...
The sanitize transformers were being duplicated each time the Markdown
renderer was called, leading to expontential growth in rendering times.
The problem was that although HTML::Pipeline::SanitizationFilter.WHITELIST
is a frozen hash, the `:transformers` array can be modified. We need
to do deep copy of this to avoid adding duplicates.
Closes #49409
2018-07-24 13:00:49 -07:00
f5b45519db
Merge branch 'osw-background-migrations-best-practice-doc' into 'master'
...
Add best practice points regarding background migrations on huge tables
See merge request gitlab-org/gitlab-ce!20815
2018-07-24 18:28:42 +00:00
39cb42c329
Merge branch 'docs/ha-etc-ssh-typo' into 'master'
...
Fix typo in high availability docs
See merge request gitlab-org/gitlab-ce!20805
2018-07-24 18:05:47 +00:00
eabd11bd89
Merge branch 'docs/pat-typo' into 'master'
...
Remove extra parenthesis in PAT docs
See merge request gitlab-org/gitlab-ce!20807
2018-07-24 18:04:48 +00:00
c06e2ac888
Merge branch 'backport-gitlab-database' into 'master'
...
Backport various EE changes to Gitlab::Database
See merge request gitlab-org/gitlab-ce!20809
2018-07-24 16:48:27 +00:00
378610372f
Add points regarding background migrations on huge tables
2018-07-24 12:39:52 -03:00
068768e1f8
Merge branch 'osw-49554-broken-master' into 'master'
...
Add :sidekiq group to cleanup redis in after callback
See merge request gitlab-org/gitlab-ce!20816
2018-07-24 15:36:20 +00:00
dffe984d94
Add :sidekiq group to cleanup redis in after callback
2018-07-24 12:23:33 -03:00
abae261b86
Merge branch 'dz-refactor-object-store-settings' into 'master'
...
Create class responsible for default object store settings
See merge request gitlab-org/gitlab-ce!20785
2018-07-24 14:25:25 +00:00
e659b398f3
Merge branch 'zj-backup-timeout' into 'master'
...
Remove timeouts for long running requests
See merge request gitlab-org/gitlab-ce!20810
2018-07-24 13:15:25 +00:00
a90a080aef
Merge branch 'frozen-string-danger' into 'master'
...
Check Frozen String Literal in Danger
See merge request gitlab-org/gitlab-ce!20767
2018-07-24 13:03:09 +00:00
4de8a3dab1
Merge branch 'jxterry-private-profile' into 'master'
...
Add an option to have a private profile on GitLab
See merge request gitlab-org/gitlab-ce!20387
2018-07-24 12:46:19 +00:00
99011a61cf
Add an option to have a private profile on GitLab
2018-07-24 12:46:19 +00:00
adc327d3fa
Merge branch 'zj-repo-cleanup-mandatory' into 'master'
...
Make repository cleanup mandatory
Closes #49550
See merge request gitlab-org/gitlab-ce!20808
2018-07-24 12:45:28 +00:00
eca751a833
Merge branch 'update-improve-issue-boards-links-to-docs' into 'master'
...
Update improve issue boards links to docs [ci skip]
See merge request gitlab-org/gitlab-ce!20803
2018-07-24 12:08:03 +00:00
e77f46d129
Remove timeouts for long running requests
2018-07-24 13:56:28 +02:00
edf1c1fccf
Make ObjectStoreSettings use more explicit and add specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2018-07-24 14:44:44 +03:00
e36f49fb4f
Merge branch '43011-typecast-markdownversion-prop-notesapp' into 'master'
...
Fix Vue datatype errors for markdownVersion parsing
See merge request gitlab-org/gitlab-ce!20800
2018-07-24 11:35:05 +00:00
7dabb48e9b
Merge branch 'kp-stacked-progress-bar-decimal-places' into 'master'
...
Show decimal place up to single digit in Stacked Progress Bar
Closes gitlab-ee#6028
See merge request gitlab-org/gitlab-ce!20776
2018-07-24 11:33:09 +00:00
ad73953772
Make repository cleanup mandatory
2018-07-24 13:25:27 +02:00
2ade035eb2
Backport various EE changes to Gitlab::Database
...
These changes are useful for CE as well. For example, the MR
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20720 can make
use of some of the backported methods.
2018-07-24 13:25:01 +02:00
281640653d
Remove extra parenthesis in PAT docs
2018-07-24 12:24:57 +02:00
1c24eafb41
Merge branch 'docs-add-read_repository-description' into 'master'
...
adds read_repository scope description
See merge request gitlab-org/gitlab-ce!20707
2018-07-24 10:22:48 +00:00
79e7024017
Merge branch 'sh-bump-sanitize-4.6.6' into 'master'
...
Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance
See merge request gitlab-org/gitlab-ce!20795
2018-07-24 10:13:35 +00:00
08c2a5f8f9
Update gitlab.md
2018-07-24 12:01:50 +02:00
e9a098ee45
Merge branch 'frozen-string-enable-app-serializers' into 'master'
...
Enable frozen string in app/serializers/**/*.rb
See merge request gitlab-org/gitlab-ce!20726
2018-07-24 09:54:19 +00:00
ac3f92391c
Update improve issue boards links to docs [ci skip]
2018-07-24 12:53:05 +03:00
db00a9c641
Add Dangerfile for frozen_string_literal
...
Checks that new Ruby files will enable
frozen string literal.
Partially addresses #47424 .
2018-07-24 02:17:45 -07:00
a64821866a
Add changelog entry
2018-07-24 14:29:20 +05:30
26b12d6f83
Use `parseInt` to convert markdownVersion into number
2018-07-24 14:20:01 +05:30
d4e9cd9de4
Merge branch 'feature/add-docs-to-disable-listener' into 'master'
...
Add docs to disable proxy listener
See merge request gitlab-org/gitlab-ce!19734
2018-07-24 08:22:34 +00:00
7df1fb7db6
Add docs to disable proxy listener
2018-07-24 08:22:34 +00:00
3f11703156
Merge branch 'revert-aeb3df17' into 'master'
...
Revert "Merge branch '2211-add-option-to-change-clone-path-docs' into 'master'"
See merge request gitlab-org/gitlab-ce!20633
2018-07-24 08:11:07 +00:00
32dffd465b
Add changelog entry
2018-07-24 12:58:10 +05:30
d6ec3ac6ba
Use `roundOffFloat` method to show decimal places in progressbar
2018-07-24 12:58:10 +05:30
b487881494
Add `roundOffFloat` helper method
2018-07-24 12:58:08 +05:30
943c51e43d
Merge branch 'docs-no-milestone-issues-api' into 'master'
...
In docs, add `No+Milestone` for querying by milestone
See merge request gitlab-org/gitlab-ce!20784
2018-07-24 06:34:08 +00:00
9cf57400c5
Merge branch 'gitaly-remove-fetch-ref' into 'master'
...
Annotate Gitlab::Git::Repository#fetch_ref
See merge request gitlab-org/gitlab-ce!20742
2018-07-24 06:33:55 +00:00
4147a2dbbd
Annotate Gitlab::Git::Repository#fetch_ref
2018-07-24 06:33:55 +00:00
dc5e3c0bf2
Bump nokogiri to 1.8.4 and sanitize to 4.6.6 for performance
...
sanitize 4.6.6 has this optimization that will benefit Markdown rendering: https://github.com/rgrove/sanitize/pull/183
nokogiri 1.4.4 has this memory leak fix: https://github.com/sparklemotion/nokogiri/pull/1771
2018-07-23 22:05:39 -07:00
Achilleas Pipinellis
Rémy Coutable
Tobias Hernstig
Stan Hu
Michael Kozono
jelhan
Robert Speicher
Yorick Peterse
Marcia Ramos
Oswaldo Ferreira
Douwe Maan
JX Terry
Zeger-Jan van de Weg
Dmitriy Zaporozhets
Phil Hughes
Davin Walker
George Tsiolis
gfyoung
Kushal Pandya
maxmeyer
Sean McGivern
Jacob Vosmaer (GitLab)