Commits · df91318a8bd8bc47e751b798677ac1085d4f6eea · nexedi / gitlab-ce

25 Jul, 2018 40 commits
- Merge branch 'ce-to-ee-2018-07-25' into 'master' · df91318a
  Rémy Coutable authored Jul 25, 2018
```
CE upstream - 2018-07-25 12:22 UTC

See merge request gitlab-org/gitlab-ee!6659
```
  df91318a
- Regenerated locale/gitlab.pot · 33dfca35
  Lin Jen-Shin authored Jul 25, 2018
  
  33dfca35
- Resolve conflicts for app/views/layouts · 692d049b
  Lin Jen-Shin authored Jul 25, 2018
  
  692d049b
- Resolve doc/api/users.md · 43c87a2f
  Lin Jen-Shin authored Jul 25, 2018
  
  43c87a2f
- Merge branch 'ee-49582-enable-cops-for-db' into 'master' · b01739ac
  Rémy Coutable authored Jul 25, 2018
```
EE: Enable rubocop for db/**/* and ee/db/**/*

See merge request gitlab-org/gitlab-ee!6654
```
  b01739ac
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-25 · 6b37f335
  GitLab Bot authored Jul 25, 2018
```
# Conflicts:
#	app/views/layouts/devise.html.haml
#	app/views/layouts/devise_empty.html.haml
#	app/views/layouts/mailer.text.erb
#	app/views/layouts/nav/sidebar/_admin.html.haml
#	app/views/layouts/nav/sidebar/_profile.html.haml
#	doc/api/users.md
#	locale/gitlab.pot

[ci skip]
```
  6b37f335
- Merge branch 'backport-reactive-caching' into 'master' · f7084577
  Rémy Coutable authored Jul 25, 2018
```
Back port ReactiveCaching

See merge request gitlab-org/gitlab-ce!20836
```
  f7084577
- Merge branch '49025-docs-kubernetes-tiller' into 'master' · d22db4f4
  Marcia Ramos authored Jul 25, 2018
```
doc: Configuring and initializing Helm Tiller

Closes #49025

See merge request gitlab-org/gitlab-ce!20515
```
  d22db4f4
- Merge branch 'docs/styleguide-versions' into 'master' · fe7c6bc6
  Marcia Ramos authored Jul 25, 2018
```
Prefer using direct links in docs styleguide

See merge request gitlab-org/gitlab-ce!20832
```
  fe7c6bc6
- Merge branch 'winh-service-desk-clipboard' into 'master' · 6d4e3734
  Phil Hughes authored Jul 25, 2018
```
Replace clipboard icon in Service Desk settings

Closes #6988

See merge request gitlab-org/gitlab-ee!6643
```
  6d4e3734
- Replace clipboard icon in Service Desk settings · dbc6cfb6
  Winnie Hellmann authored Jul 25, 2018
  
  dbc6cfb6
- Backport reactive caching · c807a418
  Shinya Maeda authored Jul 25, 2018
  
  c807a418
- Fix Rubocop offenses for EE migrations · d3ac3c94
  Lin Jen-Shin authored Jul 25, 2018
  
  d3ac3c94
- Enable rubocop for db/**/* and ee/db/**/* · 43971ef2
  Lin Jen-Shin authored Jul 25, 2018
  
  43971ef2
- Merge branch 'update-rack-attack-deprecation-note-in-docs' into 'master' · 9aa07a7e
  Douwe Maan authored Jul 25, 2018
```
Adds rack attack disabled by default notice to documentation

See merge request gitlab-org/gitlab-ce!20833
```
  9aa07a7e
- Merge branch 'remove-rack-attack-deprecation-warning-in-docs' into 'master' · 6ac88596
  Douwe Maan authored Jul 25, 2018
```
Updates documentation to state that rack attack will be disabled by default…

See merge request gitlab-org/gitlab-ee!6653
```
  6ac88596
- Merge branch '40973-disable-rack-attack-by-default' into 'master' · cd03a8ad
  Douwe Maan authored Jul 25, 2018
```
Disable Rack Attack by default

Closes #40973

See merge request gitlab-org/gitlab-ce!16669
```
  cd03a8ad
- Merge branch 'replace-snake-case-css-classes' into 'master' · 73e0679e
  Phil Hughes authored Jul 25, 2018
```
Replace snake case css classes

See merge request gitlab-org/gitlab-ee!6651
```
  73e0679e
- Adds changelog · 8f39bb5d
  Tiago Botelho authored Jul 25, 2018
  
  8f39bb5d
- Updates documentation to state that rack attack will be disabled by default... · d3e4b2b4
  Tiago Botelho authored Jul 25, 2018
```
Updates documentation to state that rack attack will be disabled by default starting at version 11.2
```
  d3e4b2b4
- Adds rack attack disabled by default notice to documentation · f0f285ef
  Tiago Botelho authored Jul 25, 2018
  
  f0f285ef
- Merge branch 'make-review-app-jobs-manual' into 'master' · 0a4ad2d9
  Sean McGivern authored Jul 25, 2018
```
Improve the 'review' job and make it manual

See merge request gitlab-org/gitlab-ee!6535
```
  0a4ad2d9
- Merge branch 'frozen-string-enable-app-presenters' into 'master' · 891cb10f
  Rémy Coutable authored Jul 25, 2018
```
Enable frozen string in presenters and policies

See merge request gitlab-org/gitlab-ce!20819
```
  891cb10f
- Fix Rack Attack documentation to reflect the feature being disabled by default · 54b38529
  Tiago Botelho authored Jan 25, 2018
  
  54b38529
- Disables Rack Attack by default · 0fd901bd
  Tiago Botelho authored Jan 24, 2018
  
  0fd901bd
- Merge branch 'i18n-extract-app/views/layouts' into 'master' · 911d45b7
  Rémy Coutable authored Jul 25, 2018
```
i18n: externalize strings from 'app/views/layouts'

See merge request gitlab-org/gitlab-ce!19766
```
  911d45b7
- Replace author_link snake case in EE specific vue component · 39958726
  George Tsiolis authored Jul 25, 2018
  
  39958726
- Merge branch 'sh-bump-html-pipeline-2.8.4' into 'master' · 40631412
  Rémy Coutable authored Jul 25, 2018
```
Bump html-pipeline to 2.8.4

See merge request gitlab-org/gitlab-ce!20828
```
  40631412
- Merge branch 'replace-all-snake-case-in-scss-variables' into 'master' · 9fe58f5a
  Phil Hughes authored Jul 25, 2018
```
Replace snake case in SCSS variables

See merge request gitlab-org/gitlab-ce!20799
```
  9fe58f5a
- Merge branch 'replace-all-snake-case-in-scss-variables' into 'master' · b71195b9
  Phil Hughes authored Jul 25, 2018
```
Replace all snake case in scss variables

See merge request gitlab-org/gitlab-ee!6649
```
  b71195b9
- Merge branch 'sh-use-wiki-limit-parameter-gitaly' into 'master' · 61bed25a
  Sean McGivern authored Jul 25, 2018
```
Use limit parameter to retrieve Wikis from Gitaly

See merge request gitlab-org/gitlab-ce!20764
```
  61bed25a
- Replace author_link snake case in EE specs · e03ec2b8
  George Tsiolis authored Jul 25, 2018
  
  e03ec2b8
- Merge branch 'docs-fix-users-md-typo' into 'master' · d426a53c
  Achilleas Pipinellis authored Jul 25, 2018
```
Fix missing ` in users.md

See merge request gitlab-org/gitlab-ce!20817
```
  d426a53c
- Update the Review Apps cleanup function · 37b79dfa
  Rémy Coutable authored Jul 19, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  37b79dfa
- Improve the 'review' job and make it manual · 930c58f7
  Rémy Coutable authored Jul 17, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  930c58f7
- Merge branch 'replace-snake-case-css-classes' into 'master' · 0cdaf2cc
  Phil Hughes authored Jul 25, 2018
```
Replace author_link snake case in stylesheets, specs, and helpers

Closes #30921

See merge request gitlab-org/gitlab-ce!20797
```
  0cdaf2cc
- Prefer using direct links in docs styleguide · 9982ff3f
  Achilleas Pipinellis authored Jul 25, 2018
  
  9982ff3f
- Replace author_link snake case in stylesheets, specs, and helpers · f0bd1e3c
  George Tsiolis authored Jul 23, 2018
  
  f0bd1e3c
- Replace author_link snake case in specs · c9523af2
  George Tsiolis authored Jul 23, 2018
  
  c9523af2
- Replace author_link snake case in vue components · fec79013
  George Tsiolis authored Jul 23, 2018
  
  fec79013