Commits · 887471c85977f8365e6bebb20a2c2045abc74a4d · nexedi / gitlab-ce

26 Sep, 2017 20 commits
- [CE->EE] Conflicts resolving. Part 2 · 887471c8
  Valery Sizov authored Sep 26, 2017
  
  887471c8
- Conflicts resolvation, part 1 · d19a32fd
  Valery Sizov authored Sep 26, 2017
  
  d19a32fd
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream · dfef847d
  Valery Sizov authored Sep 26, 2017
  
  dfef847d
- Merge branch 'changes-bar-dynamic-placeholder' into 'master' · b187a3f2
  Filipa Lacerda authored Sep 26, 2017
```
Dynamically create offset for sticky bar

See merge request gitlab-org/gitlab-ce!14280
```
  b187a3f2
- Merge branch '34371-cycle-analitcs-components-vue' into 'master' · 178ae69b
  Phil Hughes authored Sep 26, 2017
```
Moves cycle analytics components into vue files

See merge request gitlab-org/gitlab-ce!14464
```
  178ae69b
- Moves cycle analytics components into vue files · b524b9eb
  Filipa Lacerda authored Sep 26, 2017
  
  b524b9eb
- Merge branch '38374-add-note-for-upgrading-helm-chart-prior-to-1-3-5-docs' into 'master' · ba4f7413
  Achilleas Pipinellis authored Sep 26, 2017
```
Add note for upgrading Helm chart prior to 1.3.5 - docs

Closes #38374

See merge request gitlab-org/gitlab-ce!14491
```
  ba4f7413
- Add note for upgrading Helm chart prior to 1.3.5 - docs · 5e33b1df
  Joshua Lambert authored Sep 26, 2017
  
  5e33b1df
- Merge branch 'ee-remove-old-nav-styles' into 'master' · 93044dec
  Phil Hughes authored Sep 26, 2017
```
Port of remove-old-nav-styles to EE

See merge request gitlab-org/gitlab-ee!3004
```
  93044dec
- Port of remove-old-nav-styles to EE · fcf5e1b4
  Annabel Dunstone Gray authored Sep 26, 2017
  
  fcf5e1b4
- Merge branch 'remove-old-nav-styles' into 'master' · 07f5c3c3
  Phil Hughes authored Sep 26, 2017
```
Remove old nav code - Part 1

See merge request gitlab-org/gitlab-ce!14379
```
  07f5c3c3
- Merge branch 'ce-to-ee' into 'master' · d537d251
  Dmitriy Zaporozhets authored Sep 26, 2017
```
CE Upstream - Monday

Closes gitaly#524

See merge request gitlab-org/gitlab-ee!3007
```
  d537d251
- Merge branch 'winh-user-dropdown-nowrap' into 'master' · a7265abd
  Phil Hughes authored Sep 26, 2017
```
Avoid wrapping users in dropdown

Closes #38077

See merge request gitlab-org/gitlab-ce!14410
```
  a7265abd
- Merge branch 'document-background-migration-stealing' into 'master' · 3689b9e5
  Yorick Peterse authored Sep 26, 2017
```
Document manual cleanup after background migration stealing

See merge request gitlab-org/gitlab-ce!14477
```
  3689b9e5
- Merge branch 'sh-geo-handle-no-current-geo-node' into 'master' · 46a1af50
  Nick Thomas authored Sep 26, 2017
```
Gracefully handle case where current instance is not a Geo Node

See merge request gitlab-org/gitlab-ee!2977
```
  46a1af50
- Merge branch 'send-valid-project-path-as-name-for-jira' into 'master' · ac6378c0
  Sean McGivern authored Sep 26, 2017
```
Send valid project path as name for Jira dev panel integration

See merge request gitlab-org/gitlab-ee!3005
```
  ac6378c0
- Merge branch 'fix-locked-shared-runners-problem' into 'master' · 6b354370
  Kamil Trzciński authored Sep 26, 2017
```
Fix locked shared runners problem

Closes gitlab-runner#2782

See merge request gitlab-org/gitlab-ce!14483
```
  6b354370
- Merge branch 'patch-2' into 'master' · 923ad9a9
  Douwe Maan authored Sep 26, 2017
```
Update gitlab-shell to 5.9.2

See merge request gitlab-org/gitlab-ce!14446
```
  923ad9a9
- Merge branch 'rs-remove-dead-markdown-pipeline' into 'master' · d2102393
  Douwe Maan authored Sep 26, 2017
```
Remove dead `Gitlab::Markdown::Pipeline` class

See merge request gitlab-org/gitlab-ce!14487
```
  d2102393
- Merge branch '31094-define-color-priorities' into 'master' · 38a848be
  Annabel Dunstone Gray authored Sep 26, 2017
```
Update color variables

See merge request gitlab-org/gitlab-ce!14456
```
  38a848be
25 Sep, 2017 20 commits
- Merge branch '3453-remove-geo-repository-sync-backoff' into 'master' · a5c0a3e8
  Stan Hu authored Sep 25, 2017
```
Remove the backoff delay from Geo repository sync

Closes #3453

See merge request gitlab-org/gitlab-ee!3009
```
  a5c0a3e8
- Merge branch 'acet-repo-editor-fix-reopening-existing-file' into 'master' · 53b3ad5f
  Jacob Schatz authored Sep 25, 2017
```
RepoEditor: Fix reopening the existing file on refresh.

Closes #38250

See merge request gitlab-org/gitlab-ce!14449
```
  53b3ad5f
- Merge branch '37912-fix-dash-in-note-access-role' into 'master' · 2d93ff94
  Rémy Coutable authored Sep 25, 2017
```
Fix a dash being rendered in the note's access role

Closes #37912

See merge request gitlab-org/gitlab-ce!14450
```
  2d93ff94
- Fix a dash being rendered in the note's access role · 6e65c755
  Micael Bergeron authored Sep 25, 2017
  
  6e65c755
- Merge branch 'rc/tag-specs' into 'master' · a4ffde6e
  Robert Speicher authored Sep 25, 2017
```
Add a `:type` to all specs

See merge request gitlab-org/gitlab-ce!14371
```
  a4ffde6e
- Merge branch 'docs/chmod-644' into 'master' · ecd17958
  Rémy Coutable authored Sep 25, 2017
```
Remove execution permission (unix file permissions) for documentation

Closes #38287

See merge request gitlab-org/gitlab-ce!14471
```
  ecd17958
- Merge branch '38155-autodevops-typo' into 'master' · 9cb9331e
  Achilleas Pipinellis authored Sep 25, 2017
```
Fix auto devops typos in Pipeline Settings view

Closes #38155

See merge request gitlab-org/gitlab-ce!14403
```
  9cb9331e
- Fix UI bugs · a241b872
  Annabel Dunstone Gray authored Sep 25, 2017
  
  a241b872
- Remove dead `Gitlab::Markdown::Pipeline` class · 3a8c548e
  Robert Speicher authored Sep 25, 2017
  
  3a8c548e
- Fix specs · ca980de3
  Annabel Dunstone Gray authored Sep 21, 2017
  
  ca980de3
- Remove all old sub nav bars · 42dc515f
  Annabel Dunstone Gray authored Sep 21, 2017
  
  42dc515f
- Combine all search releated CSS · 739422c9
  Annabel Dunstone Gray authored Sep 21, 2017
  
  739422c9
- Remove unused admin subnavs · 2414d941
  Annabel Dunstone Gray authored Sep 19, 2017
  
  2414d941
- Move new nav into main CSS folder · 80471444
  Annabel Dunstone Gray authored Sep 19, 2017
  
  80471444
- Merge branch 'sh-fix-email-provider-take2' into 'master' · b83dcd3a
  Yorick Peterse authored Sep 25, 2017
```
Fix PG::UniqueViolation external_email migration

Closes #38246

See merge request gitlab-org/gitlab-ce!14474
```
  b83dcd3a
- Add CHANGELOG entry · fefd61c1
  Tomasz Maczukin authored Sep 25, 2017
  
  fefd61c1
- Fix locked shared runners problem · 48d9a722
  Tomasz Maczukin authored Sep 25, 2017
  
  48d9a722
- Merge remote-tracking branch 'upstream/master' into ce-to-ee · 511f5570
  Nick Thomas authored Sep 25, 2017
  
  511f5570
- CE->EE: resolve conflicts in app/views/projects/branches/index.html.haml · 806371bf
  Nick Thomas authored Sep 25, 2017
  
  806371bf
- Merge branch '3516-fix-nomethoderror-zero-on-nil' into 'master' · 131e1db5
  Sean McGivern authored Sep 25, 2017
```
Fix an error reporting some failures in the elasticsearch indexer

Closes #3516

See merge request gitlab-org/gitlab-ee!2998
```
  131e1db5