Commits · bfe7f7bdc7b0e5ba19304c218345376684bcbd26 · nexedi / gitlab-ce

12 Dec, 2018 30 commits
- Merge branch 'refactor-create-or-update-import-data' into 'master' · bfe7f7bd
  Robert Speicher authored Dec 12, 2018
```
Refactor Project#create_or_update_import_data

See merge request gitlab-org/gitlab-ce!23701
```
  bfe7f7bd
- Merge branch 'issue_55024' into 'master' · c7ba5c0a
  Nick Thomas authored Dec 12, 2018
```
Do not save user preferences on read-only mode

Closes #55024

See merge request gitlab-org/gitlab-ce!23698
```
  c7ba5c0a
- Do not save user preferences on read-only mode · b80dca82
  Felipe Artur authored Dec 12, 2018
  
  b80dca82
- Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs · 2ccd4b36
  Sid Sijbrandij authored Dec 12, 2018
  
  2ccd4b36
- Ensure everyone reads https://gitlab.com/charts/gitlab/merge_requests/599/diffs · 5df8a654
  Sid Sijbrandij authored Dec 12, 2018
  
  5df8a654
- Merge branch 'feature/gb/ci-pipeline-bridge' into 'master' · 099777a3
  Kamil Trzciński authored Dec 12, 2018
```
Add basic implementation of CI/CD bridge job

See merge request gitlab-org/gitlab-ce!23730
```
  099777a3
- Merge branch 'qa-mr-wait-for-push' into 'master' · c6db4471
  Nick Thomas authored Dec 12, 2018
```
Wait for push before trying to create a new MR

See merge request gitlab-org/gitlab-ce!23745
```
  c6db4471
- Merge branch 'zj-fix-pool-creation' into 'master' · 460eb38c
  Nick Thomas authored Dec 12, 2018
```
Fix creation query for pools repository

See merge request gitlab-org/gitlab-ce!23729
```
  460eb38c
- Fix creation query for pools repository · 9abb9800
  Zeger-Jan van de Weg authored Dec 12, 2018
  
  9abb9800
- Merge branch '54650-send-an-email-to-project-owners-when-a-mirror-update-fails' into 'master' · b9ccf013
  Nick Thomas authored Dec 12, 2018
```
Send a notification email on mirror update errors

Closes #54650

See merge request gitlab-org/gitlab-ce!23595
```
  b9ccf013
- Merge branch 'docs/update-automatic-merge-documentation' into 'master' · 5ee900ee
  Marcia Ramos authored Dec 12, 2018
```
Update automatic merging documentation

See merge request gitlab-org/gitlab-ce!23689
```
  5ee900ee
- Merge branch 'lock-sass-3.5' into 'master' · be449047
  Stan Hu authored Dec 12, 2018
```
Specify sass ~> 3.5 in Gemfile

See merge request gitlab-org/gitlab-ce!23716
```
  be449047
- Merge branch 'patch-35' into 'master' · 85102b59
  Marcia Ramos authored Dec 12, 2018
```
Docs: Add spaces before code snippets in vuex.md

See merge request gitlab-org/gitlab-ce!23737
```
  85102b59
- Merge branch 'issue_55133' into 'master' · 4dfe7178
  Sean McGivern authored Dec 12, 2018
```
Fix issuables sort direction button parameters

Closes #55133

See merge request gitlab-org/gitlab-ce!23744
```
  4dfe7178
- Simplify CI/CD bridge class · 4f2685fb
  Grzegorz Bizon authored Dec 12, 2018
  
  4f2685fb
- Specify sass ~> 3.5 in Gemfile · 060eccc7
  Pirate Praveen authored Dec 11, 2018
  
  060eccc7
- Merge branch 'patch-35' into 'master' · b42b53c1
  Achilleas Pipinellis authored Dec 12, 2018
```
Documentation: Content corrections for reCAPTCHA docs

See merge request gitlab-org/gitlab-ce!23667
```
  b42b53c1
- Merge branch 'docs-add-fork-mr-clarification' into 'master' · e462e234
  Achilleas Pipinellis authored Dec 12, 2018
```
add information about how merge requests related to forks are processed

See merge request gitlab-org/gitlab-ce!23764
```
  e462e234
- Merge branch 'tatkins-installation-method-docs' into 'master' · a380bf1f
  Achilleas Pipinellis authored Dec 12, 2018
```
Add docs to help choose the best GitLab installation method

Closes #54308

See merge request gitlab-org/gitlab-ce!23254
```
  a380bf1f
- Merge branch 'docs/ci-yaml-table-links' into 'master' · 9d609753
  Achilleas Pipinellis authored Dec 12, 2018
```
Add hyperlinks to ci yaml documentation

See merge request gitlab-org/gitlab-ce!23674
```
  9d609753
- Merge branch 'patch-35' into 'master' · 616f351b
  Achilleas Pipinellis authored Dec 12, 2018
```
Update README.md

See merge request gitlab-org/gitlab-ce!23672
```
  616f351b
- Merge branch 'docs-update-rack-attack' into 'master' · 7306f7af
  Achilleas Pipinellis authored Dec 12, 2018
```
Remove incorrect example Rack Attack configuration

Closes #54983

See merge request gitlab-org/gitlab-ce!23742
```
  7306f7af
- add information about how merge requests related to forks are processed · 03ca3389
  Alexander Tanayno authored Dec 12, 2018
```
the added note describes code from https://gitlab.com/gitlab-org/gitlab-ee/blob/master/lib/gitlab/import_export/merge_request_parser.rb#L15
```
  03ca3389
- Merge branch 'fix-rubocop-issues' into 'master' · 7b1ea8ca
  Rémy Coutable authored Dec 12, 2018
```
Fix ConstantName rubocop offense

See merge request gitlab-org/gitlab-ce!23677
```
  7b1ea8ca
- Merge branch 'fixed-note-awards-js' into 'master' · f5eddb80
  Filipa Lacerda authored Dec 12, 2018
```
Fixed emoji awards not being added to notes

Closes #55141

See merge request gitlab-org/gitlab-ce!23720
```
  f5eddb80
- Merge branch 'iamphill-master-patch-68477' into 'master' · d675b3e8
  Filipa Lacerda authored Dec 12, 2018
```
Increase the debounce of Issue Suggestions

See merge request gitlab-org/gitlab-ce!23721
```
  d675b3e8
- Add basic implementation of CI/CD bridge job · 320b6d96
  Grzegorz Bizon authored Dec 10, 2018
  
  320b6d96
- Merge branch 'winh-markdown-preview-lists' into 'master' · 21553950
  Phil Hughes authored Dec 12, 2018
```
Remove unnecessary div from MarkdownField to apply list styles correctly

Closes #55190

See merge request gitlab-org/gitlab-ce!23733
```
  21553950
- Remove unnecessary div from MarkdownField to apply list styles correctly · 1285fe68
  Winnie Hellmann authored Dec 11, 2018
  
  1285fe68
- Send a notification email on mirror update errors · b65cb237
  Alejandro Rodríguez authored Dec 05, 2018
```
The email is sent to project maintainers containing the last mirror
update error. This will allow maintainers to set alarms and react
accordingly.
```
  b65cb237
11 Dec, 2018 10 commits
- Merge branch 'add-docs-lint-back' into 'master' · e7a6b841
  Stan Hu authored Dec 11, 2018
```
Docs: Enable gitlab-docs lint

Closes gitlab-com/gitlab-docs#305

See merge request gitlab-org/gitlab-ce!23748
```
  e7a6b841
- Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master' · c8aaf15c
  Stan Hu authored Dec 11, 2018
```
[CE] Fix DiffCheck failing due to invalid string argument

See merge request gitlab-org/gitlab-ce!23741
```
  c8aaf15c
- Merge branch 'mk/fix-links-to-sections-that-were-moved' into 'master' · 0ad13562
  Marcia Ramos authored Dec 11, 2018
```
Docs: Fix links to sections that were moved

See merge request gitlab-org/gitlab-ce!23750
```
  0ad13562
- Merge branch '52696-raw-diff-patch-requests' into 'master' · 91c64c04
  Rémy Coutable authored Dec 11, 2018
```
Add spec for plain diff/email patch

Closes #52696

See merge request gitlab-org/gitlab-ce!23529
```
  91c64c04
- Merge branch 'winh-check-yarn-version' into 'master' · 6adb769e
  Mike Greiling authored Dec 11, 2018
```
Check that yarn version is at least 1.10.0

See merge request gitlab-org/gitlab-ce!23612
```
  6adb769e
- Merge branch '55183-frozenerror-can-t-modify-frozen-string-in-app-mailers-notify-rb' into 'master' · fb00525a
  Stan Hu authored Dec 11, 2018
```
Fix a potential frozen string error in app/mailers/notify.rb

Closes #55183

See merge request gitlab-org/gitlab-ce!23728
```
  fb00525a
- Merge branch 'winh-timeline-entry-jest' into 'master' · fd703ce0
  Fatih Acet authored Dec 11, 2018
```
Migrate timeline_entry_item_spec.js to Jest

See merge request gitlab-org/gitlab-ce!23686
```
  fd703ce0
- Fix links to sections that were moved · ceb7631c
  Michael Kozono authored Dec 11, 2018
  
  ceb7631c
- Merge branch 'winh-dropdown-item-style' into 'master' · f2029dbb
  Annabel Dunstone Gray authored Dec 11, 2018
```
Apply existing dropdown item styles to .dropdown-item class

See merge request gitlab-org/gitlab-ce!23663
```
  f2029dbb
- Merge branch 'ee-fj-web-ide-terminal-docs' into 'master' · 1ee3c06f
  Marcia Ramos authored Dec 11, 2018
```
Docs: update Web IDE docs

See merge request gitlab-org/gitlab-ce!23735
```
  1ee3c06f