Commits · 3d14b768500078e6a90966a22c351b3958512f24 · nexedi / gitlab-ce

26 Feb, 2018 1 commit
- Move BoardNewIssue vue component · 3d14b768
  George Tsiolis authored Feb 06, 2018
  
  3d14b768
21 Feb, 2018 39 commits
- Merge branch 'ee-dispatcher-import-batch-1' into 'master' · 399ba520
  Jacob Schatz authored Feb 21, 2018
```
Use dynamic imports in dispatcher (EE)

See merge request gitlab-org/gitlab-ee!4658
```
  399ba520
- Add export to ee module · 352e5ad4
  Clement Ho authored Feb 21, 2018
  
  352e5ad4
- Merge branch 'ee-rest-of-dispatcher' into 'master' · 5e2d5e17
  Clement Ho authored Feb 21, 2018
```
Rest of Dispatcher Refactor (EE)

See merge request gitlab-org/gitlab-ee!4595
```
  5e2d5e17
- Rest of Dispatcher Refactor (EE) · d742270f
  Constance Okoghenun authored Feb 21, 2018
  
  d742270f
- Use dynamic imports in dispatcher (EE) · f45739fb
  Clement Ho authored Feb 21, 2018
  
  f45739fb
- Merge branch 'ce-to-ee-2018-02-21' into 'master' · bba525d0
  Clement Ho authored Feb 21, 2018
```
CE upstream - 2018-02-21 18:26 UTC

See merge request gitlab-org/gitlab-ee!4657
```
  bba525d0
- Merge branch 'ee-dispatcher-import-project' into 'master' · 24ad9469
  Jacob Schatz authored Feb 21, 2018
```
Use dynamic imports for project dispatcher paths (EE)

See merge request gitlab-org/gitlab-ee!4656
```
  24ad9469
- Use dynamic imports for project dispatcher paths (EE) · 53a05d34
  Clement Ho authored Feb 21, 2018
  
  53a05d34
- Fix conflicts · da55884c
  Clement Ho authored Feb 21, 2018
  
  da55884c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-21 · ca40657f
  GitLab Bot authored Feb 21, 2018
```
# Conflicts:
#	app/views/shared/milestones/_sidebar.html.haml
#	config/webpack.config.js

[ci skip]
```
  ca40657f
- 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 'ee-update-browser-perf-testing-example-doc' into 'master' · 82e2c2e7
  Marcia Ramos authored Feb 21, 2018
```
Update EE Browser Performance Testing Example

See merge request gitlab-org/gitlab-ee!4643
```
  82e2c2e7
- 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 '4939-codeclimate-description' into 'master' · 21b47272
  Dmitriy Zaporozhets authored Feb 21, 2018
```
Resolve "Code quality shows `check_name`, but should show `description`"

Closes #4939

See merge request gitlab-org/gitlab-ee!4652
```
  21b47272
- Merge branch 'ce-to-ee-2018-02-21' into 'master' · 23def3c7
  Rémy Coutable authored Feb 21, 2018
```
CE upstream - 2018-02-21 15:21 UTC

See merge request gitlab-org/gitlab-ee!4653
```
  23def3c7
- 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 'ee-feature/#2848-display-time-tracking-totals-milestone-page' into 'master' · 3ea9a903
  Clement Ho authored Feb 21, 2018
```
Display time tracking totals on milestone page (EE)

See merge request gitlab-org/gitlab-ee!4634
```
  3ea9a903
- Display time tracking totals on milestone page (EE) · c49774d4
  Clement Ho authored Feb 21, 2018
  
  c49774d4
- 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 'minor-update-to-browser-testing-mr-docs' into 'master' · 4aa0ab3b
  Marcia Ramos authored Feb 21, 2018
```
Minor tweak to browser performance testing MR widget docs

See merge request gitlab-org/gitlab-ee!4644
```
  4aa0ab3b
- 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
- Resolve conflict in .gitlab-ci.yml · e6cf25fa
  Rémy Coutable authored Feb 21, 2018
  
  e6cf25fa
- 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
- Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master' · 17eb01be
  Rémy Coutable authored Feb 21, 2018
```
Refactor IssuableFinder to extract model-specific logic

See merge request gitlab-org/gitlab-ee!4635
```
  17eb01be
- Resolve conflict for spec/javascripts/pipelines/pipeline_details_mediator_spec.js · fd3cf20c
  Filipa Lacerda authored Feb 21, 2018
  
  fd3cf20c