Commits · 24bd2c03f563003f3811ec7c35b4992cba6d033a · nexedi / gitlab-ce

16 Feb, 2018 9 commits
- Merge branch 'ee-pipeline-chart-bundle' into 'master' · 24bd2c03
  Filipa Lacerda authored Feb 16, 2018
```
Updated pipelines charts to use dynamic webpack bundle

See merge request gitlab-org/gitlab-ee!4558
```
  24bd2c03
- remove pipelines_charts.js · 17ba0e76
  Phil Hughes authored Feb 16, 2018
  
  17ba0e76
- Merge branch 'ce-to-ee-2018-02-16' into 'master' · 2becedf6
  Marin Jankovski authored Feb 16, 2018
```
CE upstream - 2018-02-16 09:23 UTC

See merge request gitlab-org/gitlab-ee!4570
```
  2becedf6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-16 · 33592b8d
  GitLab Bot authored Feb 16, 2018
  
  33592b8d
- Merge branch 'update-profiler-docs-explaining-how-to-provide-user' into 'master' · 049d2cc4
  Sean McGivern authored Feb 16, 2018
```
Add documentation about how to provide a user to Gitlab::Profiler

See merge request gitlab-org/gitlab-ce!17169
```
  049d2cc4
- Merge branch 'dm-escape-commit-message' into 'master' · 27b71e80
  Sean McGivern authored Feb 16, 2018
```
Escape HTML entities in commit messages

Closes #42833

See merge request gitlab-org/gitlab-ce!17144
```
  27b71e80
- Merge branch 'move-issue-reorg' into 'master' · 06004734
  Sean McGivern authored Feb 16, 2018
```
Re-organize issue move method calls

See merge request gitlab-org/gitlab-ce!17146
```
  06004734
- Improve error handling for Gitlab::Profiler and improve doc about providing a user · bda4f081
  Dylan Griffith authored Feb 16, 2018
  
  bda4f081
- Merge branch 'ce-to-ee-2018-02-15' into 'master' · 708de533
  Stan Hu authored Feb 16, 2018
```
CE upstream - 2018-02-15 21:22 UTC

See merge request gitlab-org/gitlab-ee!4564
```
  708de533
15 Feb, 2018 31 commits
- Merge branch 'users-show-dispatcher-refactor' into 'master' · 1192526b
  Jacob Schatz authored Feb 15, 2018
```
Remove Webpack bundle tag for users:show

See merge request gitlab-org/gitlab-ce!17014
```
  1192526b
- Remove Webpack bundle tag for users:show · a68a2306
  Constance Okoghenun authored Feb 15, 2018
  
  a68a2306
- Merge branch 'fix-compile-assets' into 'master' · 74b8d670
  Jacob Schatz authored Feb 15, 2018
```
Remove duplicate imports

See merge request gitlab-org/gitlab-ee!4566
```
  74b8d670
- Merge branch 'axios-members-ajax' into 'master' · c840e871
  Jacob Schatz authored Feb 15, 2018
```
Replace $.ajax with axios in members.js

See merge request gitlab-org/gitlab-ee!4473
```
  c840e871
- Replace $.ajax with axios in members.js · 989d4535
  Clement Ho authored Feb 15, 2018
  
  989d4535
- Remove duplicate imports · bf9f8040
  Clement Ho authored Feb 15, 2018
  
  bf9f8040
- Merge branch '42929-hide-new-variable-values' into 'master' · 975dc69e
  Clement Ho authored Feb 15, 2018
```
Hide CI secret variable values on save

Closes #42929

See merge request gitlab-org/gitlab-ce!17044
```
  975dc69e
- Merge branch 'axios-mirror-pull' into 'master' · da96cfad
  Jacob Schatz authored Feb 15, 2018
```
Replace $.getJSON with axios in mirrorPull

See merge request gitlab-org/gitlab-ee!4517
```
  da96cfad
- Merge branch 'remove-weight-select-issuable-sidebar' into 'master' · e4d49957
  Jacob Schatz authored Feb 15, 2018
```
Remove unused weightSelect from initIssuableSidebar

See merge request gitlab-org/gitlab-ee!4521
```
  e4d49957
- Merge branch 'axios-importer-get' into 'master' · 2203d108
  Jacob Schatz authored Feb 15, 2018
```
Replace $.get with axios in importerStatus

See merge request gitlab-org/gitlab-ce!17122
```
  2203d108
- Replace $.get with axios in importerStatus · f5caabad
  Clement Ho authored Feb 15, 2018
  
  f5caabad
- Merge branch 'dispatcher-groups' into 'master' · a23da54d
  Jacob Schatz authored Feb 15, 2018
```
Refactor ee dispatcher groups:*

See merge request gitlab-org/gitlab-ee!4563
```
  a23da54d
- Refactor ee dispatcher groups:* · 629d9769
  Clement Ho authored Feb 15, 2018
  
  629d9769
- Merge branch... · 837a74e6
  Robert Speicher authored Feb 15, 2018
```
Merge branch '4942-create-a-new-job-to-check-that-ee-specific-files-are-added-to-the-top-level-ee-folder' into 'master'

Resolve "Create a new job to check that EE-specific files are added to the top-level ee/ folder"

Closes #4942

See merge request gitlab-org/gitlab-ee!4553
```
  837a74e6
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-15 · c0a379b3
  GitLab Bot authored Feb 15, 2018
  
  c0a379b3
- Add scripts/ee-files-location-check to check wrong location of new EE-specific files · 5d3e9cde
  Rémy Coutable authored Feb 15, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  5d3e9cde
- Merge branch '43201-rename-repository-submit-button-disabled' into 'master' · 4342e391
  Filipa Lacerda authored Feb 15, 2018
```
Resolve "Renaming repository (project[name]) fails on 2nd try if the validation has failed"

Closes #43201

See merge request gitlab-org/gitlab-ce!17150
```
  4342e391
- Merge branch 'winh-new-modal-component' into 'master' · 681e5f77
  Filipa Lacerda authored Feb 15, 2018
```
Add new modal Vue component

See merge request gitlab-org/gitlab-ce!17108
```
  681e5f77
- Merge branch 'sh-filter-secret-variables' into 'master' · 238781a6
  Robert Speicher authored Feb 15, 2018
```
Filter secret variable values from logs

Closes #43313

See merge request gitlab-org/gitlab-ce!17159
```
  238781a6
- Merge branch 'ce-to-ee-2018-02-15' into 'master' · 30d42bcd
  Stan Hu authored Feb 15, 2018
```
CE upstream - 2018-02-15 18:29 UTC

See merge request gitlab-org/gitlab-ee!4562
```
  30d42bcd
- Filter secret variable values from logs · efbe0768
  Stan Hu authored Feb 15, 2018
```
Right now Project::VariablesController users the `value` parameter to send the
secret variable value. `value` is a pretty generic term and could be used in
other controllers, but for now it's better to err on the side of caution and
filter this out.

Closes #43313
```
  efbe0768
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-02-15 · 326d3cb1
  GitLab Bot authored Feb 15, 2018
  
  326d3cb1
- Merge branch... · 84cad03a
  Clement Ho authored Feb 15, 2018
```
Merge branch '4557-change-icon-and-color-of-issue-statuses-in-related-issues-and-epic-issues' into 'master'

Resolve "Change icon and color of issue statuses in related issues and epic issues"

Closes #4557

See merge request gitlab-org/gitlab-ee!4497
```
  84cad03a
- Resolve "Change icon and color of issue statuses in related issues and epic issues" · 5406714e
  Luke Bennett authored Feb 15, 2018
  
  5406714e
- Merge branch 'project-integrations-form-dispatcher-refactor' into 'master' · efdde042
  Fatih Acet authored Feb 15, 2018
```
Removed integrations webpack bundle tag

See merge request gitlab-org/gitlab-ce!17147
```
  efdde042
- Merge branch 'ce-to-ee-2018-02-15' into 'master' · 5f22c2d4
  Rémy Coutable authored Feb 15, 2018
```
CE upstream - 2018-02-15 13:59 UTC

Closes gitlab-qa#177, gitlab-qa#157 et #1

See merge request gitlab-org/gitlab-ee!4556
```
  5f22c2d4
- Merge branch '42734-reenable-eslint-commits-js' into 'master' · 9d0b54d4
  Clement Ho authored Feb 15, 2018
```
Re-enable eslint in `commits.js` file

Closes #42734

See merge request gitlab-org/gitlab-ce!17096
```
  9d0b54d4
- Re-enable eslint in `commits.js` file · 65e761e6
  André Luís authored Feb 15, 2018
  
  65e761e6
- Fixes Renaming repository (project[name]) fails on 2nd try whend the validation has failed · 7d79b5cc
  Jacopo authored Feb 15, 2018
  
  7d79b5cc
- Updated pipelines charts to use dynamic webpack bundle · 75f0b09f
  Phil Hughes authored Feb 15, 2018
```
#41341
```
  75f0b09f
- Merge branch 'fj-42910-unauthenticated-limit-via-ssh' into 'master' · ee2313f6
  Douwe Maan authored Feb 15, 2018
```
Remove internal api calls from the rack::attack throttling

Closes #42910

See merge request gitlab-org/gitlab-ce!17149
```
  ee2313f6