Commits · 1793e8391cfd276fba766b0dab2d7cca1b8c1219 · nexedi / gitlab-ce

13 Nov, 2018 29 commits
- Refactoring Gitlab::Geo::OauthSession class · 1793e839
  Douglas Barbosa Alexandre authored Nov 05, 2018
```
The Gitlab::Geo::OauthSession has a lot of responsibilities,
this changes extracts each responsability into a proper class:

- GitLab::Geo::Oauth::Session
- GitLab::Geo::Oauth::LoginState
- GitLab::Geo::Oauth::LogoutState
- GitLab::Geo::Oauth::LogoutToken
- GitLab::ReturnToLocation
```
  1793e839
- Merge branch 'archive-builds-documentation-ee' into 'master' · 883c8d9b
  Achilleas Pipinellis authored Nov 13, 2018
```
EE: Add documentation for archive builds

See merge request gitlab-org/gitlab-ee!8386
```
  883c8d9b
- EE: Add documentation for archive builds · 89207201
  Kamil Trzciński authored Nov 13, 2018
  
  89207201
- Merge branch 'group-security-dashboard-action-button-improvements' into 'master' · 6bf1794a
  Tim Zallmann authored Nov 13, 2018
```
Adds a few UX tweaks after a call with @andyvolpe

See merge request gitlab-org/gitlab-ee!8217
```
  6bf1794a
- Merge branch... · 435d2595
  Nick Thomas authored Nov 13, 2018
```
Merge branch '8376-ops-dashboard-should-be-available-for-public-projects-on-gitlab-com' into 'master'

Resolve "Ops Dashboard should be available for public projects on GitLab.com"

Closes #8376

See merge request gitlab-org/gitlab-ee!8399
```
  435d2595
- Resolve "Ops Dashboard should be available for public projects on GitLab.com" · 86dce7bd
  Peter Leitzen authored Nov 13, 2018
  
  86dce7bd
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · fb7a068f
  Sean McGivern authored Nov 13, 2018
```
CE upstream - 2018-11-13 09:21 UTC

See merge request gitlab-org/gitlab-ee!8418
```
  fb7a068f
- Remove unnecessary EE changelog · 7b8351e2
  Sean McGivern authored Nov 13, 2018
  
  7b8351e2
- Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into ce-to-ee-2018-11-13 · ba3dfae9
  Sean McGivern authored Nov 13, 2018
  
  ba3dfae9
- Resolve lockfile conflicts · 964672f3
  Sean McGivern authored Nov 13, 2018
  
  964672f3
- Merge branch 'gt-change-issue-analytics-breadcrumb' into 'master' · 7c4a0452
  Sean McGivern authored Nov 13, 2018
```
Change issues analytics breadcrumb

Closes #8402

See merge request gitlab-org/gitlab-ee!8414
```
  7c4a0452
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · e08f9cf5
  GitLab Bot authored Nov 13, 2018
```
# Conflicts:
#	Gemfile.lock
#	Gemfile.rails5.lock

[ci skip]
```
  e08f9cf5
- Merge branch '8255-transient-failure-of-dashboard_spec-js' into 'master' · 07ab8b33
  Phil Hughes authored Nov 13, 2018
```
Resolve "Transient failure of dashboard_spec.js"

Closes #8255

See merge request gitlab-org/gitlab-ee!8369
```
  07ab8b33
- Merge branch 'zj-remove-broken-storage' into 'master' · d159a680
  Douwe Maan authored Nov 13, 2018
```
Remove obsolete gitlab_shell checks

See merge request gitlab-org/gitlab-ce!22417
```
  d159a680
- Merge branch '53888-missing-favicon' into 'master' · 94ab99a8
  Phil Hughes authored Nov 13, 2018
```
Adds back missing CI favicon

Closes #53888

See merge request gitlab-org/gitlab-ce!23002
```
  94ab99a8
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · 08e5896e
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 04:22 UTC

See merge request gitlab-org/gitlab-ee!8417
```
  08e5896e
- Merge branch '53289-update-haml_lint-to-0-28-0' into 'master' · 474b502a
  Rémy Coutable authored Nov 13, 2018
```
Update haml_lint to 0.28.0

Closes #53289

See merge request gitlab-org/gitlab-ce!22660
```
  474b502a
- Merge branch '53291-update-ffaker-to-2-10-0' into 'master' · 1818570c
  Rémy Coutable authored Nov 13, 2018
```
Update ffaker to 2.10.0

Closes #53291

See merge request gitlab-org/gitlab-ce!22661
```
  1818570c
- Move JSONWebToken::HMACToken out from EE · e39eb1f9
  Ash McKenzie authored Nov 08, 2018
```
- Add .decode()
- Add tests
```
  e39eb1f9
- Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master' · 12397018
  Stan Hu authored Nov 13, 2018
```
Relocate JSONWebToken::HMACToken from EE

See merge request gitlab-org/gitlab-ce!22906
```
  12397018
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · e39fa43b
  GitLab Bot authored Nov 13, 2018
  
  e39fa43b
- Merge branch '53894-docs-update-adding-project-txt-to-match-up-with-image' into 'master' · 5fd652de
  Evan Read authored Nov 13, 2018
```
Resolve "Docs update - adding project txt to match up with image"

Closes #53894

See merge request gitlab-org/gitlab-ce!23008
```
  5fd652de
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · 5d3eace2
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 01:21 UTC

Closes gitlab-org/quality/team-tasks#24

See merge request gitlab-org/gitlab-ee!8416
```
  5d3eace2
- Adding what Projects permission is needed as text to match up with the image. · 0b639cb8
  astrachan authored Nov 13, 2018
  
  0b639cb8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · e291e14a
  GitLab Bot authored Nov 13, 2018
  
  e291e14a
- Merge branch 'ce-to-ee-2018-11-13' into 'master' · c406372a
  🤖 GitLab Bot 🤖 authored Nov 13, 2018
```
CE upstream - 2018-11-13 00:21 UTC

See merge request gitlab-org/gitlab-ee!8415
```
  c406372a
- Merge branch 'docs-quality/team-tasks-24' into 'master' · 03e46cf7
  Mek Stittri authored Nov 13, 2018
```
Improve the 'Testing levels' documentation

Closes gitlab-org/quality/team-tasks#24

See merge request gitlab-org/gitlab-ce!21505
```
  03e46cf7
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-13 · 8b93ae82
  GitLab Bot authored Nov 13, 2018
  
  8b93ae82
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · db28195b
  Stan Hu authored Nov 13, 2018
```
CE upstream - 2018-11-12 21:21 UTC

See merge request gitlab-org/gitlab-ee!8413
```
  db28195b
12 Nov, 2018 11 commits
- Resolve conflicts in app/services/issues/move_service.rb · 1040d3a4
  Stan Hu authored Nov 12, 2018
  
  1040d3a4
- Merge branch 'align-vertical-discussion-line' into 'master' · dbb342d4
  Fatih Acet authored Nov 12, 2018
```
Align all avatars and system notes in discussion

See merge request gitlab-org/gitlab-ce!22994
```
  dbb342d4
- Add externalized string for issues analytics breadcrumb · a9a839b7
  George Tsiolis authored Nov 13, 2018
  
  a9a839b7
- Change issues analytics breadcrumb · b4c9e293
  George Tsiolis authored Nov 13, 2018
  
  b4c9e293
- Adds back missing CI favicon · ff790ddf
  Filipa Lacerda authored Nov 12, 2018
```
The CI favicon was missing in the jobs page.
This commit fixes it.

Closes #53888
```
  ff790ddf
- Relocate JSONWebToken::HMACToken from EE · a3c80014
  Ash McKenzie authored Nov 08, 2018
  
  a3c80014
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-12 · 3616bc1a
  GitLab Bot authored Nov 12, 2018
```
# Conflicts:
#	app/services/issues/move_service.rb

[ci skip]
```
  3616bc1a
- Merge branch 'ce-to-ee-2018-11-12' into 'master' · a579b8af
  🤖 GitLab Bot 🤖 authored Nov 12, 2018
```
CE upstream - 2018-11-12 20:21 UTC

Closes gitlab-ce#53180 and #8397

See merge request gitlab-org/gitlab-ee!8411
```
  a579b8af
- Fix transient dashboard spec failure · f4d58dcc
  Adriel Santiago authored Nov 08, 2018
  
  f4d58dcc
- Merge branch 'ce-3777-promote-to-epic' into 'master' · ec3712c2
  Rémy Coutable authored Nov 12, 2018
```
Refactoring Issues::MoveService (port of promote epics)

See merge request gitlab-org/gitlab-ce!22766
```
  ec3712c2
- Merge branch 'ce-3777-promote-to-epic-preparation' into 'master' · d1dff7de
  Rémy Coutable authored Nov 12, 2018
```
Extract code from Issues::MoveService

See merge request gitlab-org/gitlab-ee!8402
```
  d1dff7de