Commits · 1143411ae848fade4050d3d8319ba5ed88a1b1da · nexedi / gitlab-ce

23 Nov, 2018 7 commits
- Reduce Sidekiq signature of scheduled tokens migration · 1143411a
  Grzegorz Bizon authored Nov 23, 2018
  
  1143411a
- Add test case for scheduling runners tokens migration · 627b4833
  Grzegorz Bizon authored Nov 23, 2018
  
  627b4833
- Add specs for runners tokens encryption migration · 9ab50c86
  Grzegorz Bizon authored Nov 23, 2018
  
  9ab50c86
- Improve test cases description in token-related specs · 718ea942
  Grzegorz Bizon authored Nov 23, 2018
  
  718ea942
- Only allow valid options when configuring tokens · 636b038e
  Grzegorz Bizon authored Nov 23, 2018
  
  636b038e
- Improve token strategy fallback and add more specs · d31a3873
  Grzegorz Bizon authored Nov 23, 2018
  
  d31a3873
- Fix static analysis in utf8 helper methods · d1311119
  Grzegorz Bizon authored Nov 23, 2018
  
  d1311119
22 Nov, 2018 1 commit
- Ensure that db encryption keys have proper bytesize · 777b6713
  Grzegorz Bizon authored Nov 22, 2018
  
  777b6713
21 Nov, 2018 18 commits
- Do not append new line to Base64 encoded encrypted value · 8a235c0c
  Grzegorz Bizon authored Nov 21, 2018
  
  8a235c0c
- Add missing specs for crypto helper class · 13cfd53d
  Grzegorz Bizon authored Nov 21, 2018
  
  13cfd53d
- Schedule background migration for encrypting runners tokens · c7a39ffa
  Grzegorz Bizon authored Nov 21, 2018
  
  c7a39ffa
- Add migratable models for runners tokens migration · 64c23778
  Grzegorz Bizon authored Nov 21, 2018
  
  64c23778
- Add database indices to encrypted runner tokens · 3578eb45
  Grzegorz Bizon authored Nov 21, 2018
  
  3578eb45
- Merge remote-tracking branch 'dev/master' into security-encrypt-runners-tokens · 88e2b6ea
  Grzegorz Bizon authored Nov 21, 2018
```
* dev/master: (302 commits)

Conflicts:
	db/schema.rb
	lib/gitlab/import_export/import_export.yml
```
  88e2b6ea
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · 8edce616
  Steve Azzopardi authored Nov 21, 2018
  
  8edce616
- Merge branch 'rs-asset-compilation-tags' into 'master' · 3d4ef136
  Marin Jankovski authored Nov 21, 2018
```
Add dedicated runner tags to assets job

See merge request gitlab-org/gitlab-ce!23242
```
  3d4ef136
- Merge branch 'kcj-add-philosophy' into 'master' · 0133ff99
  Sean McGivern authored Nov 21, 2018
```
Adds a PHILOSOPHY.md

See merge request gitlab-org/gitlab-ce!23200
```
  0133ff99
- Adds a PHILOSOPHY.md · 32e2c656
  Kenny Johnston authored Nov 21, 2018
  
  32e2c656
- Merge branch 'ce-8511-fix-selector-for-issuable-contents' into 'master' · 1fc450d0
  Tim Zallmann authored Nov 21, 2018
```
CE Backport: Fix Issuable container element selector for shortcuts handling

See merge request gitlab-org/gitlab-ce!23260
```
  1fc450d0
- Fix Issuable container element selector for shortcuts handling · 40bb8e8e
  Kushal Pandya authored Nov 21, 2018
  
  40bb8e8e
- Merge branch 'docs-specify-labels-in-project-group' into 'master' · 91727f7d
  Victor Wu authored Nov 21, 2018
```
Docs specify labels in project and group list pages

See merge request gitlab-org/gitlab-ce!22886
```
  91727f7d
- Merge branch 'patch-31' into 'master' · 6a31259c
  Evan Read authored Nov 21, 2018
```
Update README.md

See merge request gitlab-org/gitlab-ce!23192
```
  6a31259c
- Merge branch 'patch-32' into 'master' · c0ef1094
  Evan Read authored Nov 21, 2018
```
Fix typo in Getting Started page

See merge request gitlab-org/gitlab-ce!23219
```
  c0ef1094
- Merge branch 'mg-upgrade-prettier' into 'master' · 377af728
  Clement Ho authored Nov 21, 2018
```
Upgrade prettier to v1.15.2

See merge request gitlab-org/gitlab-ce!22893
```
  377af728
- Merge branch 'docs/pages-access-control' into 'master' · 103267f7
  Evan Read authored Nov 21, 2018
```
Add user docs for Pages access control

Closes #54143

See merge request gitlab-org/gitlab-ce!23145
```
  103267f7
- Add user docs for Pages access control · a019c9c7
  Achilleas Pipinellis authored Nov 21, 2018
  
  a019c9c7
20 Nov, 2018 14 commits
- Merge branch... · 547952b4
  Evan Read authored Nov 20, 2018
```
Merge branch '53571-Add-the-fact-that-Web-IDE-does-syntax-highlighting-for-all-languages-supported-by-Monaco' into 'master'

Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571

Closes #53571

See merge request gitlab-org/gitlab-ce!23117
```
  547952b4
- Added information about syntax highlighting in Web IDE. Fixes gitlab-org/gitlab-ce#53571 · 8a3a35d7
  Marc Schwede authored Nov 20, 2018
  
  8a3a35d7
- Merge branch 'gt-align-issue-status-and-confidential-icon' into 'master' · 5eea16ad
  Fatih Acet authored Nov 20, 2018
```
Align issue status label and confidential icon

Closes #53943

See merge request gitlab-org/gitlab-ce!23046
```
  5eea16ad
- Align issue status label and confidential icon · 516e8b2b
  George Tsiolis authored Nov 20, 2018
  
  516e8b2b
- Merge branch 'gt-externalize-app-views-repository_check_mailer' into 'master' · ec4fa1f5
  Fatih Acet authored Nov 20, 2018
```
Externalize strings from `/app/views/repository_check_mailer`

See merge request gitlab-org/gitlab-ce!23211
```
  ec4fa1f5
- Externalize strings from `/app/views/repository_check_mailer` · 338b8695
  George Tsiolis authored Nov 20, 2018
  
  338b8695
- Merge branch 'sh-bump-escape-utils' into 'master' · 233af8f1
  Douglas Barbosa Alexandre authored Nov 20, 2018
```
Upgrade escape_utils to 1.2.1

See merge request gitlab-org/gitlab-ce!23248
```
  233af8f1
- Merge branch 'gt-remove-instances-of-extend-monospace' into 'master' · e6c18efc
  Phil Hughes authored Nov 20, 2018
```
Remove instances of `@extend .monospace`

See merge request gitlab-org/gitlab-ce!23089
```
  e6c18efc
- Remove instances of `@extend .monospace` · 7974e814
  George Tsiolis authored Nov 20, 2018
  
  7974e814
- Merge branch 'gt-externalize-app-views-peek' into 'master' · 2e520274
  Fatih Acet authored Nov 20, 2018
```
Externalize strings from `/app/views/peek`

See merge request gitlab-org/gitlab-ce!23207
```
  2e520274
- Merge branch '54032-restrict-reply-shortcut-text' into 'master' · bbfdfb78
  Phil Hughes authored Nov 20, 2018
```
Resolve "The reply shortcut can add any text of the page to the "comment" text area"

Closes #54032

See merge request gitlab-org/gitlab-ce!23096
```
  bbfdfb78
- Resolve "The reply shortcut can add any text of the page to the "comment" text area" · 7ed62abf
  Thomas Pathier authored Nov 20, 2018
  
  7ed62abf
- Upgrade escape_utils to 1.2.1 · 5b42ebbf
  Stan Hu authored Nov 20, 2018
```
This matches the version shipped in gitaly-ruby.

The main changes between 1.1.1 and 1.2.1 are CI-related
improvements:
https://github.com/brianmario/escape_utils/compare/1.1.1...1.2.1
```
  5b42ebbf
- Merge branch 'ide-open-all-mr-files' into 'master' · ac6673dd
  Filipa Lacerda authored Nov 20, 2018
```
Open first 10 merge request files in IDE

Closes #51635

See merge request gitlab-org/gitlab-ce!23234
```
  ac6673dd