Commits · 74c1087640954670d5be7898b636827df6eeca8d · nexedi / gitlab-ce

15 Jun, 2018 35 commits
- Merge branch 'ee-enable-no-multi-assign' into 'master' · 74c10876
  Mike Greiling authored Jun 15, 2018
```
EE Port of gitlab-ce/!19808 (Enable no-multi-assignment in JS files)

See merge request gitlab-org/gitlab-ee!6149
```
  74c10876
- Merge branch 'ee-46610-stop-horizontal-scrolling-when-clicking-on-board-issue' into 'master' · 41df9687
  Fatih Acet authored Jun 15, 2018
```
EE port of "Removed automatic right scroll when issue an issue is clicked on the issue board"

See merge request gitlab-org/gitlab-ee!6127
```
  41df9687
- Enable no-multi-assignment in JS files · c92533cf
  gfyoung authored Jun 13, 2018
```
Partially addresses gitlab-ce/#47006.
```
  c92533cf
- Merge branch '6145-extract-app-views-shared-issuable-2-ee' into 'master' · a2351b6b
  Robert Speicher authored Jun 15, 2018
```
Resolve 2 "Extract EE specific files/lines for app/views/shared/issuable"

See merge request gitlab-org/gitlab-ee!5932
```
  a2351b6b
- Merge branch 'ee-enable-no-restricted-globals' into 'master' · 6a4853fc
  Phil Hughes authored Jun 15, 2018
```
EE Port of gitlab-ce/!19877 (Enable no-restricted-globals in JS files)

See merge request gitlab-org/gitlab-ee!6148
```
  6a4853fc
- EE Port of gitlab-ce/!19877 (Enable no-restricted-globals in JS files) · 9f361129
  gfyoung authored Jun 15, 2018
  
  9f361129
- Merge branch 'ce-to-ee-2018-06-15' into 'master' · 0a7d50ac
  Stan Hu authored Jun 15, 2018
```
CE upstream - 2018-06-15 12:21 UTC

See merge request gitlab-org/gitlab-ee!6154
```
  0a7d50ac
- Merge branch '6145-extract-app-views-shared-issuable-3-ee' into 'master' · ea5cfebf
  Robert Speicher authored Jun 15, 2018
```
Resolve 3 "Extract EE specific files/lines for app/views/shared/issuable"

See merge request gitlab-org/gitlab-ee!6121
```
  ea5cfebf
- Merge branch 'ee-fix-flakey-move-slash-command-unauthorized-project' into 'master' · 836096cc
  Robert Speicher authored Jun 15, 2018
```
Fix flakey time-sensitive move slash command with unauthorized project -- EE merge edition

See merge request gitlab-org/gitlab-ee!6124
```
  836096cc
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-15 · 32f39fb2
  GitLab Bot authored Jun 15, 2018
  
  32f39fb2
- Merge branch 'fix-rails5-nagative-enum-spec' into 'master' · 2634ef3d
  Kamil Trzciński authored Jun 15, 2018
```
Fix "[Rails5] '-1' is not a valid data_store"

Closes #47369

See merge request gitlab-org/gitlab-ce!19882
```
  2634ef3d
- Merge branch 'ide-add-last-commit-id-to-api-call' into 'master' · f5441083
  Douwe Maan authored Jun 15, 2018
```
IDE sends last commit ID when committing changes

Closes #46192

See merge request gitlab-org/gitlab-ce!19552
```
  f5441083
- Merge branch 'fl-reduce-tech-debt' into 'master' · dd4ec063
  Phil Hughes authored Jun 15, 2018
```
Removes unused imports and prettifies code

See merge request gitlab-org/gitlab-ce!19888
```
  dd4ec063
- Merge branch 'ce-jej/sanitize-group-saml-relay-state' into 'master' · 59a2123d
  Kamil Trzciński authored Jun 15, 2018
```
[CE backport] Backport InternalRedirect#sanitize_redirect

See merge request gitlab-org/gitlab-ce!19795
```
  59a2123d
- only return last_commit_sha in the JSON · 3530274b
  Phil Hughes authored Jun 15, 2018
  
  3530274b
- IDE sends last commit ID when committing changes · e906be2f
  Phil Hughes authored Jun 07, 2018
```
Closes #46192
```
  e906be2f
- Merge branch '46668-make-the-html-attribute-on-the-blob-json-call-optional' into 'master' · f39582f7
  Douwe Maan authored Jun 15, 2018
```
Resolve "Make the html attribute on the blob json call optional"

Closes #46668

See merge request gitlab-org/gitlab-ce!19479
```
  f39582f7
- Merge branch 'fix-flakey-remove-deploy-key-spec' into 'master' · 16723ff5
  Rémy Coutable authored Jun 15, 2018
```
Fix flakey time-sensitive remove deploy key spec

See merge request gitlab-org/gitlab-ce!19800
```
  16723ff5
- Merge branch 'ce-to-ee-2018-06-15' into 'master' · 883f083a
  Dmitriy Zaporozhets authored Jun 15, 2018
```
CE upstream - 2018-06-15 09:21 UTC

See merge request gitlab-org/gitlab-ee!6152
```
  883f083a
- Reuse viewer param and move logic to blob controller · fbc749a9
  Douwe Maan authored Jun 15, 2018
  
  fbc749a9
- Removes unused imports and prettifies code · 4d61850c
  Filipa Lacerda authored Jun 15, 2018
  
  4d61850c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-15 · 0f8a0f60
  GitLab Bot authored Jun 15, 2018
  
  0f8a0f60
- Remove unexpected data store test suite · d4540c61
  Shinya Maeda authored Jun 15, 2018
  
  d4540c61
- Merge branch 'add-chatops-icon-docs' into 'master' · 89acf287
  Achilleas Pipinellis authored Jun 15, 2018
```
Add ChatOps icon to docs

Closes gitlab-com/chatops#26

See merge request gitlab-org/gitlab-ee!6128
```
  89acf287
- Add ChatOps icon to docs · 21b137ce
  Andreas Kämmerle authored Jun 15, 2018
  
  21b137ce
- Merge branch 'ce-to-ee-2018-06-14' into 'master' · fe5a7f00
  Achilleas Pipinellis authored Jun 15, 2018
```
CE upstream - 2018-06-14 18:24 UTC

See merge request gitlab-org/gitlab-ee!6144
```
  fe5a7f00
- Merge branch 'docs/fix-indentation-for-current-status-section' into 'master' · 8db7e253
  Marcia Ramos authored Jun 15, 2018
```
Fix indentation for 'Current status' section

See merge request gitlab-org/gitlab-ce!19884
```
  8db7e253
- Fix indentation for 'Current status' section · 395b47aa
  Fabio Busatto authored Jun 15, 2018
  
  395b47aa
- Merge branch 'docs-assign-ancestor-group-milestones' into 'master' · b403a666
  Sean McGivern authored Jun 15, 2018
```
Remove line regarding future feature of assigning ancestor group milestones

See merge request gitlab-org/gitlab-ce!19865
```
  b403a666
- Resolve docs conflicts · a94579b0
  Achilleas Pipinellis authored Jun 15, 2018
  
  a94579b0
- Fix "[Rails5] '-1' is not a valid data_store" · 242039e4
  Shinya Maeda authored Jun 15, 2018
  
  242039e4
- Merge branch 'fix-flakey-user-assignee-autocomplete-dropdown-specs' into 'master' · a8445cc2
  Douwe Maan authored Jun 15, 2018
```
Fix flakey time-sensitive user/assignee autocomplete dropdown

See merge request gitlab-org/gitlab-ce!19799
```
  a8445cc2
- Merge branch 'jr-design-artifact-process' into 'master' · 6ce86d85
  Douwe Maan authored Jun 15, 2018
```
Update process to create new design artifact issue

See merge request gitlab-org/gitlab-ce!19465
```
  6ce86d85
- Merge branch 'safari-scrollbar-bug' into 'master' · fd34c9d6
  Phil Hughes authored Jun 15, 2018
```
Remove scrollbar in Safari in repo settings page

Closes #47410

See merge request gitlab-org/gitlab-ce!19809
```
  fd34c9d6
- Changed the query string parameter to a string · 4ac381a5
  Tim Zallmann authored Jun 15, 2018
  
  4ac381a5
14 Jun, 2018 5 commits
- Merge branch 'jivl-fix-missing-loading-dots-job-logs' into 'master' · fb08183e
  Clement Ho authored Jun 14, 2018
```
Fix missing dots from the CI job log output

Closes #47817

See merge request gitlab-org/gitlab-ce!19871
```
  fb08183e
- Remove scrollbar in Safari in repo settings page · 16854ee6
  gfyoung authored Jun 14, 2018
```
Closes #47410.
```
  16854ee6
- Merge branch 'jivl-fix-create-project-template-buttons' into 'master' · bb0875a6
  Annabel Gray authored Jun 14, 2018
```
Fix use template buttons for creating a new project

Closes #47580

See merge request gitlab-org/gitlab-ce!19654
```
  bb0875a6
- Merge branch '47938-expand-diff' into 'master' · da6c3c4b
  Clement Ho authored Jun 14, 2018
```
Resolve ""Click to expand" link in collapsed diffs should be blue"

Closes #47938

See merge request gitlab-org/gitlab-ce!19867
```
  da6c3c4b
- Resolve ""Click to expand" link in collapsed diffs should be blue" · cf01719d
  Annabel Gray authored Jun 14, 2018
  
  cf01719d