Commits · be1825fae17c6e92b147847c52df1083b050c707 · nexedi / gitlab-ce

18 Jun, 2018 2 commits
- Merge branch 'ee-specific-line-check-spelling' into 'master' · be1825fa
  Rémy Coutable authored Jun 18, 2018
```
Grammar fixes in EE build script

See merge request gitlab-org/gitlab-ee!6157
```
  be1825fa
- Merge branch '6321-board-users-finder' into 'master' · acd438be
  Sean McGivern authored Jun 18, 2018
```
Resolve "Follow-up from "Add assignee lists to boards""

Closes #6321

See merge request gitlab-org/gitlab-ee!6125
```
  acd438be
17 Jun, 2018 7 commits
- Merge branch 'ce-to-ee-2018-06-17' into 'master' · eacaee59
  Stan Hu authored Jun 17, 2018
```
CE upstream - 2018-06-17 18:24 UTC

See merge request gitlab-org/gitlab-ee!6166
```
  eacaee59
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-17 · 61dbbbff
  GitLab Bot authored Jun 17, 2018
  
  61dbbbff
- Merge branch 'remove-ci_job_request_with_tags_matcher' into 'master' · 937c1b5b
  Stan Hu authored Jun 17, 2018
```
Remove the ci_job_request_with_tags_matcher

See merge request gitlab-org/gitlab-ce!19947
```
  937c1b5b
- Merge branch 'optimise-paused-runners' into 'master' · 1e22513a
  Stan Hu authored Jun 17, 2018
```
Optimise paused runners

See merge request gitlab-org/gitlab-ce!19946
```
  1e22513a
- Remove the ci_job_request_with_tags_matcher · 55c45385
  Kamil Trzciński authored Jun 17, 2018
  
  55c45385
- Optimised paused runners to not re-query every 3s · cc48d67c
  Kamil Trzciński authored Jun 17, 2018
```
We have long polling mechanism which is not being used by paused runners.
This makes the paused runner to generate a request every 3s,
where it could be fired only every 1h.
```
  cc48d67c
- Merge branch 'ce-to-ee-2018-06-16' into 'master' · e14c0331
  Stan Hu authored Jun 17, 2018
```
CE upstream - 2018-06-16 18:22 UTC

See merge request gitlab-org/gitlab-ee!6165
```
  e14c0331
16 Jun, 2018 9 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16 · e603cfc1
  GitLab Bot authored Jun 16, 2018
  
  e603cfc1
- Merge branch 'update-nav-theme-previews' into 'master' · 7b1eb2a6
  Dmitriy Zaporozhets authored Jun 16, 2018
```
Harmonize theme preferences previews

See merge request gitlab-org/gitlab-ce!19916
```
  7b1eb2a6
- Merge branch 'ce-to-ee-2018-06-16' into 'master' · d549199a
  Stan Hu authored Jun 16, 2018
```
CE upstream - 2018-06-16 06:21 UTC

See merge request gitlab-org/gitlab-ee!6163
```
  d549199a
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16 · d0199de5
  GitLab Bot authored Jun 16, 2018
  
  d0199de5
- Merge branch 'ce-to-ee-2018-06-16' into 'master' · 98006325
  Stan Hu authored Jun 16, 2018
```
CE upstream - 2018-06-16 00:22 UTC

See merge request gitlab-org/gitlab-ee!6162
```
  98006325
- Merge branch '47610-bs4-mini-graph-dropdown-sometimes-open-on-the-top' into 'master' · f733d4f8
  Annabel Gray authored Jun 16, 2018
```
Resolve "BS4: Mini graph dropdown sometimes open on the top"

Closes #47610

See merge request gitlab-org/gitlab-ce!19912
```
  f733d4f8
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-06-16 · b37376ed
  GitLab Bot authored Jun 16, 2018
  
  b37376ed
- Merge branch '47068-pipeline-dropdown-shifts-around-at-smaller-screen-sizes' into 'master' · 958c0475
  Annabel Gray authored Jun 16, 2018
```
Resolve "Pipeline dropdown shifts around at smaller screen sizes"

Closes #47068

See merge request gitlab-org/gitlab-ce!19910
```
  958c0475
- Merge branch 'remove-small-container-width' into 'master' · c66434b1
  Annabel Gray authored Jun 16, 2018
```
Remove small container width

Closes #36439

See merge request gitlab-org/gitlab-ce!19893
```
  c66434b1
15 Jun, 2018 22 commits
- Merge branch 'ce-to-ee-2018-06-15' into 'master' · 23f5d3c1
  Stan Hu authored Jun 15, 2018
```
CE upstream - 2018-06-15 18:21 UTC

See merge request gitlab-org/gitlab-ee!6156
```
  23f5d3c1
- Harmonize theme preferences previews · d7faa41f
  Andreas Kämmerle authored Jun 16, 2018
  
  d7faa41f
- resolve conflict in app/assets/javascripts/boards/stores/boards_store.js · 603a6be9
  Lukas Eipert authored Jun 15, 2018
  
  603a6be9
- Merge branch '47917-wiki-git-access' into 'master' · a76066d7
  Clement Ho authored Jun 15, 2018
```
Resolve "Wiki git clone holder and dropdown is broken"

Closes #47917

See merge request gitlab-org/gitlab-ce!19913
```
  a76066d7
- Resolve "Wiki git clone holder and dropdown is broken" · 62bd9d34
  Annabel Gray authored Jun 15, 2018
  
  62bd9d34
- Boards - extract `Boards::UsersFinder` · 7dbf027c
  Mario de la Ossa authored Jun 13, 2018
  
  7dbf027c
- 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 'enable-no-multi-assign' into 'master' · cab4302a
  Mike Greiling authored Jun 15, 2018
```
Enable no-multi-assignment in JS files

See merge request gitlab-org/gitlab-ce!19808
```
  cab4302a
- Merge branch '45557-machine-type-help-links' into 'master' · 12a1ddd5
  Fatih Acet authored Jun 15, 2018
```
Resolve "Update link in GitLab cluster setup form to say "see pricing""

Closes #45557 and #47431

See merge request gitlab-org/gitlab-ce!19495
```
  12a1ddd5
- Resolve "Update link in GitLab cluster setup form to say "see pricing"" · 4720bd93
  Taurie Davis authored Jun 15, 2018
  
  4720bd93
- Merge branch '47879-misalignment-in-rows-on-comparison-page' into 'master' · a615144b
  Annabel Gray authored Jun 15, 2018
```
Resolve "Misalignment in rows on comparison page"

Closes #47879

See merge request gitlab-org/gitlab-ce!19909
```
  a615144b
- Resolve "Misalignment in rows on comparison page" · 06f1c4ca
  Clement Ho authored Jun 15, 2018
  
  06f1c4ca
- Grammar fixes in EE build script · 51641f84
  gfyoung authored Jun 15, 2018
```
Spelling + grammar fixes in scripts/ee_specific_check/ee_specific_check.rb
```
  51641f84
- 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
- Merge branch '46610-stop-horizontal-scrolling-when-clicking-on-board-issue' into 'master' · 2ad49d95
  Fatih Acet authored Jun 15, 2018
```
Resolve "Stop horizontal scrolling when clicking on board issue"

Closes #46610

See merge request gitlab-org/gitlab-ce!19722
```
  2ad49d95
- Resolve "Stop horizontal scrolling when clicking on board issue" · 0206a7b1
  Constance Okoghenun authored Jun 15, 2018
  
  0206a7b1
- Merge branch... · 6989a851
  Annabel Gray authored Jun 15, 2018
```
Merge branch '47975-project-select-dropdown-is-broken-for-group-issues-and-merge-requests' into 'master'

Resolve "Project select dropdown is broken for group issues and merge requests"

Closes #47975

See merge request gitlab-org/gitlab-ce!19906
```
  6989a851
- Merge branch 'jivl-remove-additional-border-users-no-group' into 'master' · f6a877c9
  Clement Ho authored Jun 15, 2018
```
Remove additional border from the create project page

Closes #47356

See merge request gitlab-org/gitlab-ce!19899
```
  f6a877c9
- Enable no-multi-assignment in JS files · dbc74800
  gfyoung authored Jun 13, 2018
```
Partially addresses #47006.
```
  dbc74800
- Fix ci mini graph dropdown alignment and positioning · 1983d1a5
  Clement Ho authored Jun 15, 2018
  
  1983d1a5
- Remove additional border from the create project page · f605d329
  Jose authored Jun 15, 2018
  
  f605d329
- Merge branch 'fix-alert-colors' into 'master' · 102db0aa
  Annabel Gray authored Jun 15, 2018
```
Fix alert colors

Closes #47983

See merge request gitlab-org/gitlab-ce!19905
```
  102db0aa