Commits · 5083bb09e2103cb5f5162b4ca0f77dfc8cc9d222 · nexedi / gitlab-ce

03 Sep, 2018 31 commits
- Resolve app/views/groups/labels/index.html.haml · 5083bb09
  Sean McGivern authored Sep 03, 2018
  
  5083bb09
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-09-03 · 3c256fa7
  GitLab Bot authored Sep 03, 2018
```
# Conflicts:
#	app/views/groups/labels/index.html.haml
#	config/initializers/1_settings.rb
#	doc/update/README.md

[ci skip]
```
  3c256fa7
- Merge branch 'docs/junit-examples' into 'master' · 31ead6cc
  Rémy Coutable authored Sep 03, 2018
```
Add JUnit Java examples in docs

See merge request gitlab-org/gitlab-ce!21472
```
  31ead6cc
- Merge branch 'sh-bump-gitlab-pages-v1.1.0' into 'master' · b2bdb004
  Nick Thomas authored Sep 03, 2018
```
Bump GitLab Pages to v1.1.0

See merge request gitlab-org/gitlab-ce!21419
```
  b2bdb004
- Refactor Java JUnit reports examples · f2999c98
  Achilleas Pipinellis authored Sep 03, 2018
  
  f2999c98
- Merge branch 'fix-download-dropdown-link' into 'master' · 0e05e3a0
  Nick Thomas authored Sep 03, 2018
```
Hide PAT creation advice for HTTP clone if PAT exists

Closes #44111

See merge request gitlab-org/gitlab-ce!18208
```
  0e05e3a0
- Add Java Maven example to junit_test_reports.md · cc34f740
  Leo authored Aug 28, 2018
  
  cc34f740
- Merge branch 'fj-2635-enable-rss-for-tags' into 'master' · 4ee68672
  Sean McGivern authored Sep 03, 2018
```
Added atom feed for tags

Closes #2635

See merge request gitlab-org/gitlab-ce!21428
```
  4ee68672
- Added atom feed for tags · 0df18ca9
  Francisco Javier López authored Sep 03, 2018
  
  0df18ca9
- Update junit_test_reports.md by providing new example for java, using gradle build tool · 5fb044b0
  Maastiff authored Aug 31, 2018
  
  5fb044b0
- Merge branch 'add-additional-ce-images-kube-doc' into 'master' · 990278be
  Achilleas Pipinellis authored Sep 03, 2018
```
Add updated ce images to kubernetes install doc

See merge request gitlab-org/gitlab-ce!21418
```
  990278be
- 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 'docs-port-ee-community-contributions' into 'master' · 8cb39fa8
  Achilleas Pipinellis authored Sep 03, 2018
```
Docs port ee community contributions

See merge request gitlab-org/gitlab-ce!21311
```
  8cb39fa8
- Merge branch 'patch-28' into 'master' · 0c8b219d
  Rémy Coutable authored Sep 03, 2018
```
Update gitlab_chart.md to fix example domain spelling missing "l"

See merge request gitlab-org/gitlab-ce!21462
```
  0c8b219d
- Merge branch '50564-chat-service-refactoring' into 'master' · 85b8206c
  Nick Thomas authored Sep 03, 2018
```
Use sample data if repo has no commit in ChatService

Closes #50564

See merge request gitlab-org/gitlab-ce!21440
```
  85b8206c
- 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 'issue_48084' into 'master' · 91ed0dbc
  Sean McGivern authored Sep 03, 2018
```
Use a serializer to render diff lines

Closes #48084

See merge request gitlab-org/gitlab-ce!21260
```
  91ed0dbc
- Merge branch 'sh-bump-unauth-expiration' into 'master' · b5be01bc
  Douwe Maan authored Sep 03, 2018
```
Bump unauthenticated session time from 1 hour to 2 hours

Closes #50393

See merge request gitlab-org/gitlab-ce!21453
```
  b5be01bc
- Merge branch 'sh-disable-sidekiq-session' into 'master' · 61ffa04d
  Sean McGivern authored Sep 03, 2018
```
Disable the Sidekiq Admin Rack session

See merge request gitlab-org/gitlab-ce!21441
```
  61ffa04d
- Merge branch '50936-docs/run-review-cleanup-only-for-gitlab-org-repos' into 'master' · de4c76bb
  Rémy Coutable authored Sep 03, 2018
```
Run the review-docs-cleanup jobs for gitlab-org repos only

Closes #50936

See merge request gitlab-org/gitlab-ce!21463
```
  de4c76bb
- Merge branch 'patch-28' into 'master' · c0fa576e
  Rémy Coutable authored Sep 03, 2018
```
Fix typo

See merge request gitlab-org/gitlab-ce!21455
```
  c0fa576e
- Merge branch 'rs-haml-lint-useless-assignment' into 'master' · febdd560
  Sean McGivern authored Sep 03, 2018
```
Enable `Lint/UselessAssignment` for haml-lint

See merge request gitlab-org/gitlab-ce!21457
```
  febdd560
- 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
- Merge branch 'sh-fix-dedupe-group-importer' into 'master' · e349c0c9
  Rémy Coutable authored Sep 03, 2018
```
Fix importers not assigning a new default group

Closes #50110

See merge request gitlab-org/gitlab-ce!21456
```
  e349c0c9
- Merge branch 'qa-cleanup-after-reorganization' into 'master' · d76b23af
  Sean McGivern authored Sep 03, 2018
```
[QA] Remove the :core tag since we're not using it anymore

See merge request gitlab-org/gitlab-ce!21436
```
  d76b23af
- Merge branch '50101-vuex-store' into 'master' · d79218fc
  Phil Hughes authored Sep 03, 2018
```
Adds Vuex store for the job log page

See merge request gitlab-org/gitlab-ce!21312
```
  d79218fc
- Adds Vuex store for the job log page · 55582b43
  🌴🌴 Filipa Lacerda - OOO back on September 17th 🌴🌴 authored Sep 03, 2018
  
  55582b43
- Merge branch 'winh-ignore-npm-devdependencies' into 'master' · e550b1ab
  Phil Hughes authored Sep 03, 2018
```
Exclude frontend development dependencies from license restrictions

See merge request gitlab-org/gitlab-ce!21430
```
  e550b1ab
- Merge branch... · f7f1c394
  Dmitriy Zaporozhets authored Sep 03, 2018
```
Merge branch '50853-vendor-auto-devops-gitlab-ci-yml-to-resolve-redeploying-deleted-app-gives-helm-error' into 'master'

Vendor Auto-DevOps.gitlab-ci.yml to resolve "Redeploying deleted app gives helm error"

Closes #50853

See merge request gitlab-org/gitlab-ce!21429
```
  f7f1c394
- Merge branch 'sh-add-object-storage-qa' into 'master' · dad32f9c
  Grzegorz Bizon authored Sep 03, 2018
```
Add basic QA test for testing attachment uploads

Closes #49957

See merge request gitlab-org/gitlab-ce!21300
```
  dad32f9c
02 Sep, 2018 2 commits
- Merge branch 'master' into sh-add-object-storage-qa · 3c633844
  Stan Hu authored Sep 02, 2018
  
  3c633844
- Run review-docs-cleanup job for gitlab-org repos only · cb7d4340
  Takuya Noguchi authored Sep 02, 2018
  
  cb7d4340
01 Sep, 2018 7 commits
- Update gitlab_chart.md to fix example domain spelling missing "l" · 8609f722
  Adam John authored Sep 01, 2018
  
  8609f722
- 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