Commits · e25b1446f4e4c718b1b8cc65e5c5a1048211b9c4 · nexedi / gitlab-ce

03 Sep, 2018 5 commits
- Add omnibus instractions for packages feature · e25b1446
  Dmitriy Zaporozhets authored Sep 03, 2018
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e25b1446
- Merge branch '5251_sast-for-groovy-docs' into 'master' · 2554a798
  Achilleas Pipinellis authored Sep 03, 2018
```
Update SAST supported language list

See merge request gitlab-org/gitlab-ee!7131
```
  2554a798
- Merge branch '4299_show_secure_results_on_environments_page_be' into 'master' · 08caac24
  Douwe Maan authored Sep 03, 2018
```
Show secure results on environments page, backend

See merge request gitlab-org/gitlab-ee!6987
```
  08caac24
- Show secure results on environments page, backend · ccc847db
  Gilbert Roulot authored Sep 03, 2018
  
  ccc847db
- Merge branch 'rs-haml-lint-useless-assignment-ee' into 'master' · b5f78ed8
  Sean McGivern authored Sep 03, 2018
```
Enable `Lint/UselessAssignment` for haml-lint

See merge request gitlab-org/gitlab-ee!7156
```
  b5f78ed8
01 Sep, 2018 15 commits
- Merge branch 'ce-to-ee-2018-09-01' into 'master' · 180c091c
  Robert Speicher authored Sep 01, 2018
```
CE upstream - 2018-09-01 09:21 UTC

See merge request gitlab-org/gitlab-ee!7165
```
  180c091c
- Fix ee/app/views/projects/services/gitlab_slack_application/_help.html.haml · 9a6cf234
  Robert Speicher authored Sep 01, 2018
  
  9a6cf234
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-01 · e07de689
  GitLab Bot authored Sep 01, 2018
  
  e07de689
- Merge branch 'assert-that-mr-diff-is-highlighted' into 'master' · ba99dfcd
  Grzegorz Bizon authored Sep 01, 2018
```
Add spec to ensure MR diffs are highlighted

Closes #50793

See merge request gitlab-org/gitlab-ce!21410
```
  ba99dfcd
- Merge branch 'ce-to-ee-2018-09-01' into 'master' · 0557ac5c
  Stan Hu authored Sep 01, 2018
```
CE upstream - 2018-09-01 03:21 UTC

See merge request gitlab-org/gitlab-ee!7160
```
  0557ac5c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-01 · 0f7b3d13
  GitLab Bot authored Sep 01, 2018
  
  0f7b3d13
- Correct remaining `Lint/UselessAssignment` haml-lint violations in EE · 70d093f9
  Robert Speicher authored Aug 31, 2018
  
  70d093f9
- Fix incorrect `page_title`, `nav`, and `header_title` usage in EE views · 16855d90
  Robert Speicher authored Aug 31, 2018
  
  16855d90
- Correct remaining `Lint/UselessAssignment` haml-lint violations · 4b3e9f56
  Robert Speicher authored Aug 31, 2018
  
  4b3e9f56
- Fix incorrect `page_title`, `nav`, and `header_title` usage in views · 30eb9f92
  Robert Speicher authored Aug 31, 2018
```
During https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19766,
several usages of these helper methods were mistakenly changed to
instead assign to a (completely unused) local variable.

When `page_title` was misused, for example, this resulted in the page no
longer having a custom title set.
```
  30eb9f92
- Enable `Lint/UselessAssignment` for haml-lint · 64a5fa5f
  Robert Speicher authored Aug 31, 2018
  
  64a5fa5f
- Merge branch 'ce-to-ee-2018-09-01' into 'master' · 4a52c1f4
  Robert Speicher authored Sep 01, 2018
```
CE upstream - 2018-09-01 00:21 UTC

See merge request gitlab-org/gitlab-ee!7154
```
  4a52c1f4
- Merge branch 'feature/#32877-add-default-field-branch-api' into 'master' · 21b7e203
  Robert Speicher authored Sep 01, 2018
```
Add default parameter to branches API

Closes #32877

See merge request gitlab-org/gitlab-ce!21294
```
  21b7e203
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-01 · 5d90377c
  GitLab Bot authored Sep 01, 2018
  
  5d90377c
- Merge branch '50365_fix_fast_spec_helper' into 'master' · f9b96bd2
  Robert Speicher authored Sep 01, 2018
```
Move fixture_path out of support/rspec file which is used by fast_spec_helper

Closes #50365

See merge request gitlab-org/gitlab-ce!21240
```
  f9b96bd2
31 Aug, 2018 20 commits
- Merge branch 'ash.mckenzie/allow-auth-via-jwt' into 'master' · 0fa2d167
  Robert Speicher authored Aug 31, 2018
```
Allow auth via JWT (always false in CE)

See merge request gitlab-org/gitlab-ce!21038
```
  0fa2d167
- Merge branch 'ce-to-ee-2018-08-31' into 'master' · 4584d760
  Robert Speicher authored Aug 31, 2018
```
CE upstream - 2018-08-31 09:21 UTC

See merge request gitlab-org/gitlab-ee!7121
```
  4584d760
- Resolve doc/administration/index.md · 4828b934
  Robert Speicher authored Aug 31, 2018
  
  4828b934
- Resolve doc/administration/compliance.md · 80d18c3c
  Robert Speicher authored Aug 31, 2018
  
  80d18c3c
- Merge branch 'sh-fix-confidential-note-option' into 'master' · 9d942958
  Robert Speicher authored Aug 31, 2018
```
Fix "Confidential comments" button not saving in project hooks

Closes #50440

See merge request gitlab-org/gitlab-ce!21289
```
  9d942958
- Merge branch '47765-group-visibility-error-due-to-string-conversion' into 'master' · 472f2d56
  Douwe Maan authored Aug 31, 2018
```
Changes update_column to update_attributes in ProjectTreeRestorer#restore_project by using timeless to maintain the current timestamps

Closes #47765

See merge request gitlab-org/gitlab-ce!21242
```
  472f2d56
- Merge branch 'remove-background-migration-worker-feature-flag' into 'master' · 74c53ef6
  Douwe Maan authored Aug 31, 2018
```
Remove feature flag from BackgroundMigrationWorker

See merge request gitlab-org/gitlab-ce!21404
```
  74c53ef6
- Update SAST supported language list · e8df064c
  Gilbert Roulot authored Aug 31, 2018
  
  e8df064c
- Merge branch '37356-relative-submodule-link' into 'master' · c691e07a
  Douwe Maan authored Aug 31, 2018
```
Fix git submodule link for subgroup projects with relative path

Closes #37356

See merge request gitlab-org/gitlab-ce!21154
```
  c691e07a
- Merge branch 'ide-row-hover-scroll' into 'master' · bdae30d8
  Filipa Lacerda authored Aug 31, 2018
```
Fixed IDE file row jumping into view on hover

Closes #50751

See merge request gitlab-org/gitlab-ce!21403
```
  bdae30d8
- Merge branch '46591-fix-ide-height-issues' into 'master' · 71b7b70f
  Phil Hughes authored Aug 31, 2018
```
Resolve "Persistent banner creates problem for web ide"

Closes #46591

See merge request gitlab-org/gitlab-ce!21283
```
  71b7b70f
- Resolve "Persistent banner creates problem for web ide" · 29dc3656
  Paul Slaughter authored Aug 31, 2018
  
  29dc3656
- Merge branch 'ee-46591-fix-ide-height-issues' into 'master' · 0526e96a
  Phil Hughes authored Aug 31, 2018
```
EE Port (Resolve "Persistent banner creates problem for web ide")

See merge request gitlab-org/gitlab-ee!6923
```
  0526e96a
- EE Port (Resolve "Persistent banner creates problem for web ide") · 74aa469d
  Paul Slaughter authored Aug 31, 2018
  
  74aa469d
- Merge branch 'thorandy/gitlab-ee-servicedesk-prefer-from-replyto-over-sender' into 'master' · 5841fe78
  Kamil Trzciński authored Aug 31, 2018
```
Prefer From over Sender in Service Desk

Closes #3189

See merge request gitlab-org/gitlab-ee!7006
```
  5841fe78
- Merge branch 'update-padding-markdown' into 'master' · 2f398b51
  Phil Hughes authored Aug 31, 2018
```
Increase padding in markdown code blocks

See merge request gitlab-org/gitlab-ce!21433
```
  2f398b51
- Merge branch... · 5f047c1e
  Grzegorz Bizon authored Aug 31, 2018
```
Merge branch '46673-qa-sanity-tests-fail-with-uninitialized-constant-qa-page-view-pathname-error' into 'master'

Resolve "qa sanity tests fail with 'uninitialized constant QA::Page::View::Pathname' error"

Closes #46673

See merge request gitlab-org/gitlab-ce!21437
```
  5f047c1e
- Merge branch 'fix-ide-project-avatar-styles' into 'master' · 11b1d2e9
  Phil Hughes authored Aug 31, 2018
```
Fix IDE avatar flex sizing style

See merge request gitlab-org/gitlab-ce!21443
```
  11b1d2e9
- Fixed IDE file row jumping into view on hover · 27bce7ad
  Phil Hughes authored Aug 28, 2018
```
Closes #50751
```
  27bce7ad
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-31 · 51bc2ee2
  GitLab Bot authored Aug 31, 2018
```
# Conflicts:
#	doc/administration/compliance.md
#	doc/administration/index.md

[ci skip]
```
  51bc2ee2