Commits · fba3668d39d7f609b6bce80e4fac7dfed31eef13 · nexedi / gitlab-ce

21 Feb, 2018 4 commits
- Merge branch 'ide-without-perf-bar' into 'master' · fba3668d
  Tim Zallmann authored Feb 21, 2018
```
Fixed IDE positioning when performance bar is hidden

See merge request gitlab-org/gitlab-ee!4621
```
  fba3668d
- Merge branch 'upgrade-frontend-build-dependencies-ee' into 'master' · 5121b253
  Tim Zallmann authored Feb 21, 2018
```
Upgrade frontend build dependencies

See merge request gitlab-org/gitlab-ee!4640
```
  5121b253
- Merge branch 'sh-fix-geo-error-autoload-issues' into 'master' · 3f7d2201
  Robert Speicher authored Feb 21, 2018
```
Move Geo exceptions ee/lib/gitlab/geo.rb to fix autoload issues

Closes #4970

See merge request gitlab-org/gitlab-ee!4588
```
  3f7d2201
- Move Geo exceptions ee/lib/gitlab/geo.rb to fix autoload issues · 12ea02d6
  Stan Hu authored Feb 17, 2018
```
Closes #4970
```
  12ea02d6
20 Feb, 2018 36 commits
- update lockfile · ce78356d
  Mike Greiling authored Feb 20, 2018
  
  ce78356d
- approve change in dependencies · 733abab8
  Mike Greiling authored Feb 20, 2018
  
  733abab8
- move babel-eslint to devDependencies · fc0dab9b
  Mike Greiling authored Feb 20, 2018
  
  fc0dab9b
- update karma dependencies · 43c0eb51
  Mike Greiling authored Feb 20, 2018
  
  43c0eb51
- approve change in dependencies · 97d932e4
  Mike Greiling authored Feb 20, 2018
  
  97d932e4
- upgrade several webpack loaders · 699a9340
  Mike Greiling authored Feb 20, 2018
  
  699a9340
- update nodemon · d0cfcc0a
  Mike Greiling authored Feb 20, 2018
  
  d0cfcc0a
- upgrade various webpack plugins · 50145e1b
  Mike Greiling authored Feb 20, 2018
  
  50145e1b
- approve change in dependencies · 50af3f20
  Mike Greiling authored Feb 20, 2018
  
  50af3f20
- upgrade webpack and webpack-dev-server · ca13dda3
  Mike Greiling authored Feb 20, 2018
  
  ca13dda3
- Merge branch 'ee-jquery3' into 'master' · 9cc30060
  Jacob Schatz authored Feb 20, 2018
```
EE port of jquery3

See merge request gitlab-org/gitlab-ee!4400
```
  9cc30060
- EE port of jquery3 · 41d8cff9
  Phil Hughes authored Feb 20, 2018
  
  41d8cff9
- Merge branch 'ce-to-ee-2018-02-20' into 'master' · c33df682
  Stan Hu authored Feb 20, 2018
```
CE upstream - 2018-02-20 19:31 UTC

See merge request gitlab-org/gitlab-ee!4637
```
  c33df682
- Merge branch 'ee-issue-index-refactor' into 'master' · 5a1d74cf
  Clement Ho authored Feb 20, 2018
```
Refactor issue index filtered search

See merge request gitlab-org/gitlab-ee!4493
```
  5a1d74cf
- Merge branch 'ee-refactor-jobs-show-haml' into 'master' · dbb1f6b9
  Jacob Schatz authored Feb 20, 2018
```
Add dispatcher imports for job details bundle (EE)

See merge request gitlab-org/gitlab-ee!4565
```
  dbb1f6b9
- Merge branch 'ee-update-prometheus-10-5-docs' into 'master' · e6d6be8b
  Marcia Ramos authored Feb 20, 2018
```
EE version of Prometheus documentation changes for 10.5

See merge request gitlab-org/gitlab-ee!4625
```
  e6d6be8b
- Feedback · b4c77a1d
  Joshua Lambert authored Feb 20, 2018
  
  b4c77a1d
- Merge branch 'remove-notes-bundle-ee' into 'master' · cb8c1820
  Clement Ho authored Feb 20, 2018
```
Port of "Remove "notes" bundle from webpack config" to EE

See merge request gitlab-org/gitlab-ee!4614
```
  cb8c1820
- Port of "Remove "notes" bundle from webpack config" to EE · edc25cda
  Mike Greiling authored Feb 20, 2018
  
  edc25cda
- Merge branch 'ee-dispatcher-mr-haml' into 'master' · bc3d5b1c
  Jacob Schatz authored Feb 20, 2018
```
Add dispatcher imports for bundles used in merge request show path (EE)

See merge request gitlab-org/gitlab-ee!4629
```
  bc3d5b1c
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-20 · 619904be
  GitLab Bot authored Feb 20, 2018
  
  619904be
- Merge branch '4929-internationalize-lock-files' into 'master' · 40d65648
  Clement Ho authored Feb 20, 2018
```
Internationalize Locked files page

Closes #4929

See merge request gitlab-org/gitlab-ee!4620
```
  40d65648
- Internationalize Locked files page · f366c5f9
  André Luís authored Feb 20, 2018
  
  f366c5f9
- Merge branch 'group-approvers-restrict-docs' into 'master' · b084f3a3
  Achilleas Pipinellis authored Feb 20, 2018
```
Group approvers restrict docs

See merge request gitlab-org/gitlab-ee!4607
```
  b084f3a3
- Merge branch '4999-broken-master-spec-requests-api-v3-issues_spec-rb' into 'master' · 7685c2f0
  Robert Speicher authored Feb 20, 2018
```
Resolve "Broken master: spec/requests/api/v3/issues_spec.rb"

Closes #4999

See merge request gitlab-org/gitlab-ee!4632
```
  7685c2f0
- Merge branch '4947-move-ee-changelogs-to-ee-changelogs' into 'master' · 4ff3fe4f
  Robert Speicher authored Feb 20, 2018
```
Resolve "Move EE-specific `changelogs/unreleased-ee/` files to `ee/changelogs/unreleased/`"

Closes #4947

See merge request gitlab-org/gitlab-ee!4630
```
  4ff3fe4f
- Ensure we use a big-enough ID for resources that aren't supposed to exist · aa61dba0
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  aa61dba0
- Merge branch 'docs-link-to-custom-issue-tracker' into 'master' · 0e2ba232
  Sean McGivern authored Feb 20, 2018
```
Docs update: Link to custom issue tracker

See merge request gitlab-org/gitlab-ce!17242
```
  0e2ba232
- Merge branch 'zj-unit-test-gitaly-arrays' into 'master' · 81add16e
  Sean McGivern authored Feb 20, 2018
```
Add unit tests for Gitaly types

See merge request gitlab-org/gitlab-ce!17237
```
  81add16e
- Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master' · 94811ee1
  Robert Speicher authored Feb 20, 2018
```
Resolve "Change `bin/changelog` to generate EE changelog items in `ee/changelogs`"

Closes #43427

See merge request gitlab-org/gitlab-ce!17238
```
  94811ee1
- Move EE changelog items to ee/changelogs/unreleased · 9c7dba12
  Rémy Coutable authored Feb 20, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  9c7dba12
- Merge branch 'docs-comm-article-phoenix-app-gitlab-ci-ee' into 'master' · 70b61a3e
  Achilleas Pipinellis authored Feb 20, 2018
```
Docs: comm article Phoenix App with GitLab CI/CD

See merge request gitlab-org/gitlab-ee!4626
```
  70b61a3e
- Merge branch 'revert-828357fb' into 'master' · 64456604
  Douwe Maan authored Feb 20, 2018
```
Revert "Merge branch 'zj-n-1-root-show' into 'master'"

See merge request gitlab-org/gitlab-ce!17243
```
  64456604
- Merge branch 'ce-to-ee-2018-02-20' into 'master' · 814300f2
  Marin Jankovski authored Feb 20, 2018
```
CE upstream - 2018-02-20 15:23 UTC

See merge request gitlab-org/gitlab-ee!4627
```
  814300f2
- Add dispatcher imports for bundles used in merge request show path (EE) · 0066d0b4
  Clement Ho authored Feb 20, 2018
  
  0066d0b4
- Merge branch 'fix-diff-flash' into 'master' · 088d03bf
  Clement Ho authored Feb 20, 2018
```
only show error if there is an error

See merge request gitlab-org/gitlab-ce!17228
```
  088d03bf