Commits · e9e5e35d28b9db5402e6216a969b008bee24db2a · nexedi / gitlab-ce

21 Feb, 2018 40 commits
- Removed named import · e9e5e35d
  Constance Okoghenun authored Feb 21, 2018
  
  e9e5e35d
- Resolved conflicts with master · 11c1fc1f
  Constance Okoghenun authored Feb 21, 2018
  
  11c1fc1f
- Merge branch 'minor-improvement-to-k8s-monitoring-docs' into 'master' · 88870c87
  Marcia Ramos authored Feb 21, 2018
```
Improve link for CI environment variable, wording.

See merge request gitlab-org/gitlab-ce!17252
```
  88870c87
- Merge branch 'rest-of-dispatcher' into 'master' · ef91fadb
  Clement Ho authored Feb 21, 2018
```
Rest of Dispatcher Refactor

See merge request gitlab-org/gitlab-ce!16659
```
  ef91fadb
- Rest of Dispatcher Refactor · bd8290d9
  Jacob Schatz authored Feb 21, 2018
  
  bd8290d9
- Merge branch 'dispatcher-import-project' into 'master' · ace12dd1
  Jacob Schatz authored Feb 21, 2018
```
Use dynamic imports for project dispatcher paths

See merge request gitlab-org/gitlab-ce!17270
```
  ace12dd1
- Use dynamic imports for project dispatcher paths · 601164ca
  Clement Ho authored Feb 21, 2018
  
  601164ca
- Merge branch 'update-browser-perf-testing-example-doc' into 'master' · 8579894f
  Marcia Ramos authored Feb 21, 2018
```
Update Browser Performance Testing Example

See merge request gitlab-org/gitlab-ce!17249
```
  8579894f
- Merge branch 'ad-inline-doc-to-codequality-job' into 'master' · 61939ba4
  Dmitriy Zaporozhets authored Feb 21, 2018
```
Optimize and improve the inline documentation for the codequality job

See merge request gitlab-org/gitlab-ce!17265
```
  61939ba4
- Merge branch 'feature/#2848-display-time-tracking-totals-milestone-page' into 'master' · 4e537bf2
  Clement Ho authored Feb 21, 2018
```
#28481: Display time tracking totals on milestone page

Closes #28481

See merge request gitlab-org/gitlab-ce!16753
```
  4e537bf2
- #28481: Display time tracking totals on milestone page · 99b96a7b
  Riccardo Padovani authored Feb 21, 2018
  
  99b96a7b
- Merge branch '36847-update-update-toml-rb-to-1.0.0' into 'master' · 576dd646
  Rémy Coutable authored Feb 21, 2018
```
Resolve "[Gem Update] update toml-rb to 1.0.0"

Closes #36847

See merge request gitlab-org/gitlab-ce!17259
```
  576dd646
- Merge branch 'add-pagination-commit-diffs' into 'master' · 94ac29f6
  Robert Speicher authored Feb 21, 2018
```
Add missing pagination on the commit diff endpoint

Closes #43370

See merge request gitlab-org/gitlab-ce!17203
```
  94ac29f6
- Merge branch 'tc-info-version-check' into 'master' · 3487441b
  Sean McGivern authored Feb 21, 2018
```
Be more transparent about the version check

See merge request gitlab-org/gitlab-ce!17257
```
  3487441b
- Merge branch 'fix/new-project-path-input-overlapping' into 'master' · 7a532bcf
  Clement Ho authored Feb 21, 2018
```
Fix new project path input overlapping, height and radius #41811

Closes #41811

See merge request gitlab-org/gitlab-ce!16755
```
  7a532bcf
- Merge branch 'fix/change-event-body-label-font-size' into 'master' · 88e3915d
  Clement Ho authored Feb 21, 2018
```
Apply new default and inline label design #34725

Closes #34725

See merge request gitlab-org/gitlab-ce!16956
```
  88e3915d
- Merge branch '26039-Update-to-github-linguist5.3.x' into 'master' · daf88307
  Robert Speicher authored Feb 21, 2018
```
Resolve "Update to github-linguist 5.3.x"

Closes #26039

See merge request gitlab-org/gitlab-ce!17241
```
  daf88307
- Merge branch 'bug/misleading-ci-yaml-documentation' into 'master' · 5d0cd8b6
  Rémy Coutable authored Feb 21, 2018
```
Fixes an invalid documentation for the .gitlab-ci.yml cache:key

See merge request gitlab-org/gitlab-ce!17047
```
  5d0cd8b6
- Merge branch '42509-fix-API-PUT-projects-fails-when-only-ci_config_path-is-specified' into 'master' · ca297d7a
  Rémy Coutable authored Feb 21, 2018
```
Resolve "API: PUT /projects/:id fails when only ci_config_path is specified"

Closes #42509

See merge request gitlab-org/gitlab-ce!17105
```
  ca297d7a
- Resolve "API: PUT /projects/:id fails when only ci_config_path is specified" · 8bdfd8aa
  Kárpáti László authored Feb 21, 2018
  
  8bdfd8aa
- Merge branch '35418-remove-underline-for-avatar' into 'master' · 7732542c
  Clement Ho authored Feb 21, 2018
```
Resolve "Remove underline for avatar"

Closes #35418

See merge request gitlab-org/gitlab-ce!17219
```
  7732542c
- Merge branch 'patch-19' into 'master' · 0a523820
  Rémy Coutable authored Feb 21, 2018
```
fix docs link

See merge request gitlab-org/gitlab-ce!17195
```
  0a523820
- fix docs link · 56d7a735
  Ben Bodenmiller authored Feb 21, 2018
  
  56d7a735
- Merge branch 'sh-guard-against-nil-sidekiq-metrics-server' into 'master' · 1df01bb7
  Robert Speicher authored Feb 21, 2018
```
Guard against nil Sidekiq metrics server

Closes #41351

See merge request gitlab-org/gitlab-ce!17254
```
  1df01bb7
- Merge branch '40668-pages-domain-api-returns-404-when-using-a-specific-domain' into 'master' · 4bd30414
  Rémy Coutable authored Feb 21, 2018
```
Resolve "Pages Domain API returns 404 when using a specific domain"

Closes #40668

See merge request gitlab-org/gitlab-ce!17206
```
  4bd30414
- Merge branch 'patch-28' into 'master' · b5372d82
  Rémy Coutable authored Feb 21, 2018
```
emoji.codes is now emojicopy.com

See merge request gitlab-org/gitlab-ce!17212
```
  b5372d82
- Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master' · 062f487c
  Rémy Coutable authored Feb 21, 2018
```
Refactor IssuableFinder to extract model-specific logic

See merge request gitlab-org/gitlab-ce!17236
```
  062f487c
- Optimize and improve the inline documentation for the codequality job · a0ef01c8
  Rémy Coutable authored Feb 21, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  a0ef01c8
- Merge branch 'improve-codequality-job' into 'master' · 09220278
  Grzegorz Bizon authored Feb 21, 2018
```
Merge branch 'improve-codequality-job' into 'master'

See merge request gitlab-org/gitlab-ce!17263
```
  09220278
- Merge branch 'ce-3776-ci-view-for-sast' into 'master' · 48b14555
  Phil Hughes authored Feb 21, 2018
```
CE port of changes made to the pipeline bundle in EE - Fixes typos and adds i18n

See merge request gitlab-org/gitlab-ce!17176
```
  48b14555
- Merge branch 'rebalance-test-job-nodes-28-2' into 'master' · 4e3f7a56
  Rémy Coutable authored Feb 21, 2018
```
Reduce Spinach parallelization to 2 nodes and increase RSpec's to 28 nodes

See merge request gitlab-org/gitlab-ce!16713
```
  4e3f7a56
- Merge branch 'improve-codequality-job' into 'master' · 5ccd3bec
  Grzegorz Bizon authored Feb 21, 2018
```
Simplify the codequality job

See merge request gitlab-org/gitlab-ee!4602
```
  5ccd3bec
- Merge branch '41461-project-members-slow-due-to-sql' into 'master' · 6d2a5f04
  Yorick Peterse authored Feb 21, 2018
```
Simplify database queries in MembersFinder and improve performance for Projects::ProjectMembersController#index

Closes #41461

See merge request gitlab-org/gitlab-ce!17190
```
  6d2a5f04
- Merge branch '42877-snippets-dashboard-slow' into 'master' · cc3a3fbf
  Yorick Peterse authored Feb 21, 2018
```
Improve query performance for Dashboard::SnippetsController#index

Closes #42877

See merge request gitlab-org/gitlab-ce!17088
```
  cc3a3fbf
- Merge branch 'move-project-pages-to-rspec' into 'master' · 9ff91bc4
  Rémy Coutable authored Feb 21, 2018
```
Move project pages spinach tests to Rspec

See merge request gitlab-org/gitlab-ce!17256
```
  9ff91bc4
- Merge branch 'more-dispatcher-refactoring' into 'master' · 2f2f63a0
  Jacob Schatz authored Feb 21, 2018
```
More dispatcher refactoring

See merge request gitlab-org/gitlab-ce!17232
```
  2f2f63a0
- More readable SQL query. · b25319f9
  Andreas Brandl authored Feb 21, 2018
  
  b25319f9
- Merge branch 'docs-project-labels' into 'master' · 715b10bc
  Achilleas Pipinellis authored Feb 21, 2018
```
Update wording docs labels

See merge request gitlab-org/gitlab-ce!17248
```
  715b10bc
- Update wording docs labels · b4df2fba
  Victor Wu authored Feb 21, 2018
  
  b4df2fba
- Merge branch 'query-counting-should-not-include-cached-queries' into 'master' · 561e00b2
  Yorick Peterse authored Feb 21, 2018
```
Do not count rails sql cache as queries in query limiting

See merge request gitlab-org/gitlab-ce!17253
```
  561e00b2