Commits · fa1a75ae28b421c5d3bd926c2795a053e4c6af15 · nexedi / gitlab-ce

11 Jun, 2018 40 commits
- Merge branch 'sh-github-importer-improve-error' into 'master' · fa1a75ae
  James Lopez authored Jun 11, 2018
```
GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong

See merge request gitlab-org/gitlab-ce!19653
```
  fa1a75ae
- Merge branch '46708-page-numbers' into 'master' · 1dbb20d9
  Clement Ho authored Jun 11, 2018
```
Resolve "Fix color of page numbers"

Closes #46708

See merge request gitlab-org/gitlab-ce!19599
```
  1dbb20d9
- Merge branch 'unify-uploaders-objects_storage.rb' into 'master' · c9a7c80a
  Robert Speicher authored Jun 11, 2018
```
Unify from EE for app/uploaders/object_storage.rb

See merge request gitlab-org/gitlab-ce!19660
```
  c9a7c80a
- GitHub Rake importer: Fail with a clearer explanation if GitLab username is wrong · 28871d73
  Stan Hu authored Jun 11, 2018
  
  28871d73
- Merge branch 'unify-http_status.js' into 'master' · a8da4f3f
  Clement Ho authored Jun 11, 2018
```
Add NOT_FOUND: 404 to http_status.js from EE

See merge request gitlab-org/gitlab-ce!19659
```
  a8da4f3f
- Merge branch 'sh-expire-content-cache-after-import' into 'master' · 421957cf
  Mayra Cabrera authored Jun 11, 2018
```
Expire Wiki content cache after importing a repository

Closes #47546

See merge request gitlab-org/gitlab-ce!19617
```
  421957cf
- Unify from EE for app/uploaders/object_storage.rb · c854fe21
  Lin Jen-Shin authored Jun 12, 2018
  
  c854fe21
- Add NOT_FOUND: 404 from EE · 45254cd2
  Lin Jen-Shin authored Jun 12, 2018
  
  45254cd2
- Fix Rubocop failure in spec/models/project_spec.rb · 1756eea5
  Stan Hu authored Jun 11, 2018
  
  1756eea5
- Work around limitations of expect_any_instance_of by stubbing Project.find · 96ce4ed2
  Stan Hu authored Jun 11, 2018
  
  96ce4ed2
- Merge branch 'sh-admin-gitaly-server-fix' into 'master' · 87eb2b6e
  Clement Ho authored Jun 11, 2018
```
Revert extra CSS causing Gitaly Servers table to be misalgined

Closes #47648

See merge request gitlab-org/gitlab-ce!19623
```
  87eb2b6e
- Merge branch 'jprovazn-rails5-boards' into 'master' · 1c28b624
  Rémy Coutable authored Jun 11, 2018
```
[Rails5] Fix conversion of integer into string in board spec

Closes #47653

See merge request gitlab-org/gitlab-ce!19616
```
  1c28b624
- Expire Wiki content cache after importing a repository · 6defeb0a
  Stan Hu authored Jun 09, 2018
```
The cache state for Wikis that were imported via GitHub or Bitbucket does
not appear to have been flushed after a successful import.

Closes #47546
```
  6defeb0a
- Merge branch '47684-uploads-specs-are-failing-on-master' into 'master' · 75797ac3
  Sean McGivern authored Jun 11, 2018
```
Resolve "Uploads specs are failing on master"

Closes #47684

See merge request gitlab-org/gitlab-ce!19638
```
  75797ac3
- Merge branch 'ide-etag-polling' into 'master' · 3bd5e10e
  Filipa Lacerda authored Jun 11, 2018
```
Fix IDE pipelines eTagPoll not stopping

Closes #47678

See merge request gitlab-org/gitlab-ce!19636
```
  3bd5e10e
- Merge branch 'docs-11-0-installation-from-source-guide' into 'master' · 1de36a68
  Mayra Cabrera authored Jun 11, 2018
```
Update installation from source guide

See merge request gitlab-org/gitlab-ce!19320
```
  1de36a68
- Merge branch 'leipert-add-memory-info' into 'master' · 35748c08
  Tim Zallmann authored Jun 11, 2018
```
Set `max_old_space_size` option of node to 3.5GB during compile:assets

See merge request gitlab-org/gitlab-ce!19624
```
  35748c08
- Merge branch 'sh-suppress-env-leaks' into 'master' · 6d92a7a0
  Kamil Trzciński authored Jun 11, 2018
```
Prevent ENV from leaking variables in CI output

See merge request gitlab-org/gitlab-ce!19607
```
  6d92a7a0
- Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into 'master' · 61ac2462
  Filipa Lacerda authored Jun 11, 2018
```
Use Tooltip component in MrWidgetAuthorTime vue component

See merge request gitlab-org/gitlab-ce!19635
```
  61ac2462
- Merge branch 'fj-relax-url-validator-rules-for-user' into 'master' · e6a5d3cc
  Douwe Maan authored Jun 11, 2018
```
Avoid checking the user format in every url validation

Closes #47526

See merge request gitlab-org/gitlab-ce!19575
```
  e6a5d3cc
- Avoid checking the user format in every url validation · 1418afc2
  Francisco Javier López authored Jun 11, 2018
  
  1418afc2
- Merge branch 'unify-views-search-results' into 'master' · 180dc237
  Douwe Maan authored Jun 11, 2018
```
Hide project name if searching against a project

See merge request gitlab-org/gitlab-ce!19595
```
  180dc237
- Merge branch 'gitaly-1215-ca-count-commits' into 'master' · 77032638
  Sean McGivern authored Jun 11, 2018
```
Migrate CycleAnalytics::CommitCount to Gitaly

Closes gitaly#1215

See merge request gitlab-org/gitlab-ce!19481
```
  77032638
- Migrate CycleAnalytics::CommitCount to Gitaly · 1d50b6a4
  Kim Carlbäcker authored Jun 11, 2018
  
  1d50b6a4
- Hide project name if searching against a project · 41cfe904
  Lin Jen-Shin authored Jun 11, 2018
  
  41cfe904
- Unify app/views/search/results by using EE · a038083e
  Lin Jen-Shin authored Jun 09, 2018
  
  a038083e
- Merge branch 'jprovazn-rails5-opclasses' into 'master' · a20d3ff2
  Yorick Peterse authored Jun 11, 2018
```
[Rails5] Add missing `:comment` attribute

Closes #47650

See merge request gitlab-org/gitlab-ce!19612
```
  a20d3ff2
- Merge branch '47679-fix-failed-jobs-tab-ie11' into 'master' · da791e64
  Phil Hughes authored Jun 11, 2018
```
Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens"

Closes #47679

See merge request gitlab-org/gitlab-ce!19637
```
  da791e64
- Resolve "Table on Failed Jobs tab is overflowing in IE11 and sm screens" · 3b25ecca
  André Luís authored Jun 11, 2018
  
  3b25ecca
- Don't use Rails.root.join for upload fixture paths · 0f90c1fd
  Rémy Coutable authored Jun 11, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  0f90c1fd
- Update MrWidgetAuthorTime and MRWidgetMerged spec · d5e91071
  George Tsiolis authored Jun 11, 2018
  
  d5e91071
- fixed specs · d5dae8e5
  Phil Hughes authored Jun 11, 2018
  
  d5dae8e5
- Fix IDE pipelines eTagPoll not stopping · 7469b58e
  Phil Hughes authored Jun 11, 2018
```
Closes #47678
```
  7469b58e
- Merge branch 'gitlab-git-nlbr' into 'master' · 4274aeef
  Sean McGivern authored Jun 11, 2018
```
Don't use Gitlab::Utils.nlbr in Gitlab::Git

See merge request gitlab-org/gitlab-ce!18335
```
  4274aeef
- Don't use Gitlab::Utils.nlbr in Gitlab::Git · ea8dc107
  Jacob Vosmaer (GitLab) authored Jun 11, 2018
  
  ea8dc107
- Merge branch 'gitaly-commit-count-opt-out' into 'master' · 8742af1e
  Sean McGivern authored Jun 11, 2018
```
Move gitaly_blame,  gitaly_count_commits, gitaly_commit_count to opt-out

See merge request gitlab-org/gitlab-ce!19591
```
  8742af1e
- Move gitaly_blame, gitaly_count_commits, gitaly_commit_count to opt-out · ab40c7e3
  Jacob Vosmaer (GitLab) authored Jun 11, 2018
  
  ab40c7e3
- Rename MrWidgetAuthorTime vue component · 927d2459
  George Tsiolis authored Jun 11, 2018
  
  927d2459
- Use Tooltip component in MrWidgetAuthorTime vue component · 878f870a
  George Tsiolis authored Jun 11, 2018
  
  878f870a
- Merge branch 'rs-update-rspec' into 'master' · 7d3bbeeb
  Rémy Coutable authored Jun 11, 2018
```
Update rspec to 3.7

See merge request gitlab-org/gitlab-ce!19449
```
  7d3bbeeb