Commits · 429b9388bb193d62939653ae1df6e154bcf505ec · nexedi / gitlab-ce

30 Jul, 2018 1 commit
- Fix flaky tests in groups and project mirrors specs · 429b9388
  Grzegorz Bizon authored Jul 30, 2018
  
  429b9388
27 Jul, 2018 16 commits
- Resolves feedback round requests · bd4413eb
  Tiago Botelho authored Jul 27, 2018
  
  bd4413eb
- Refactors EE project entity when verifying it mirroring is available · d77d8964
  Tiago Botelho authored Jul 26, 2018
  
  d77d8964
- Add override verification · f5c8b4c6
  Lin Jen-Shin authored Jul 26, 2018
  
  f5c8b4c6
- Move EE verification to EE module · c212a611
  Lin Jen-Shin authored Jul 26, 2018
  
  c212a611
- Move EE specific params to its own module · 2fe01c8f
  Lin Jen-Shin authored Jul 26, 2018
  
  2fe01c8f
- Adds documentation · d5a86c3e
  Tiago Botelho authored Jul 24, 2018
  
  d5a86c3e
- Removes irrelevant unit tests for remote mirror and mirrors with the same URL · b56e4038
  Tiago Botelho authored Jul 17, 2018
  
  b56e4038
- Moves mirror updating logic over to project update service · a5accabe
  Tiago Botelho authored Jul 16, 2018
  
  a5accabe
- Adds mirror params to POST #create project endpoint parameters · 8c1215f3
  Tiago Botelho authored Jul 12, 2018
  
  8c1215f3
- Merge branch '48567-the-comparison-list-for-the-modified-icons-ee' into 'master' · 0e92a772
  Phil Hughes authored Jul 27, 2018
```
EE-Port of gitlab-ce!20501

See merge request gitlab-org/gitlab-ee!6484
```
  0e92a772
- EE-Port of gitlab-ce!20501 · f2025604
  Lukas Eipert authored Jul 27, 2018
  
  f2025604
- Merge branch 'ce-to-ee-2018-07-26' into 'master' · 4b44d0bc
  Phil Hughes authored Jul 27, 2018
```
CE upstream - 2018-07-26 17:46 UTC

Closes gitlab-qa#303

See merge request gitlab-org/gitlab-ee!6679
```
  4b44d0bc
- resolve conflicts in `app/assets/javascripts/boards/index.js` · 454214ab
  Phil Hughes authored Jul 27, 2018
  
  454214ab
- resolve conflict in `app/assets/javascripts/vue_shared/components/reports/issues_list.vue` · f7d7ff3a
  Lukas Eipert authored Jul 27, 2018
  
  f7d7ff3a
- resolve conflict in `app/assets/javascripts/vue_shared/components/reports/report_issues.vue` · c02356b4
  Lukas Eipert authored Jul 27, 2018
  
  c02356b4
- Merge branch 'bw-sha-attribute-geo-fix' into 'master' · 25cac8f4
  Stan Hu authored Jul 27, 2018
```
raise SecondaryNotConfigured if Geo DB is not found

See merge request gitlab-org/gitlab-ee!6680
```
  25cac8f4
26 Jul, 2018 23 commits
- Merge branch '6919-environments-dropdown-is-showing-on-the-cluster-health-page' into 'master' · fbfe390c
  Clement Ho authored Jul 26, 2018
```
Resolve "Environments dropdown is showing on the cluster health page"

Closes #6919

See merge request gitlab-org/gitlab-ee!6528
```
  fbfe390c
- Resolve "Environments dropdown is showing on the cluster health page" · faee8a34
  Jose Ivan Vargas authored Jul 26, 2018
  
  faee8a34
- raise SecondaryNotConfigured if Geo DB is not found · c022c44a
  Brett Walker authored Jul 26, 2018
  
  c022c44a
- Merge remote-tracking branch 'dev/master' · 3549ee7a
  Felipe Artur authored Jul 26, 2018
  
  3549ee7a
- Merge branch '5439-approved-is-confusing-wrong-wording-in-merge-request-widget' into 'master' · a654676c
  Annabel Gray authored Jul 26, 2018
```
Resolve ""Approved" is confusing / wrong wording in merge request widget"

Closes #5439

See merge request gitlab-org/gitlab-ee!6635
```
  a654676c
- Resolve ""Approved" is confusing / wrong wording in merge request widget" · 027c8c36
  Constance Okoghenun authored Jul 26, 2018
  
  027c8c36
- Merge branch 'security-fj-missing-csrf-system-hooks-ee' into 'master' · cacd7415
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] Missing CSRF in System Hooks

See merge request gitlab/gitlab-ee!647
```
  cacd7415
- Merge branch 'security-ee-event-counters-private-data' into 'master' · 1ffa979b
  Felipe Artur Cardozo authored Jul 26, 2018
```
[master] EE: Don't expose project names in various counters

See merge request gitlab/gitlab-ee!638
```
  1ffa979b
- Resolve conflicts in lib/gitlab/prometheus/queries/query_additional_metrics.rb · aa8ef510
  Stan Hu authored Jul 26, 2018
  
  aa8ef510
- Resolve conflicts in app/helpers/environments_helper.rb · 40c94334
  Stan Hu authored Jul 26, 2018
  
  40c94334
- Resolve conflicts in Gemfile.lock · 4df85e57
  Stan Hu authored Jul 26, 2018
  
  4df85e57
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-07-26 · c96913e8
  GitLab Bot authored Jul 26, 2018
```
# Conflicts:
#	Gemfile.lock
#	app/assets/javascripts/boards/index.js
#	app/assets/javascripts/vue_shared/components/reports/issues_list.vue
#	app/assets/javascripts/vue_shared/components/reports/report_issues.vue
#	app/helpers/environments_helper.rb
#	lib/gitlab/prometheus/queries/query_additional_metrics.rb
#	locale/gitlab.pot

[ci skip]
```
  c96913e8
- Merge branch 'ce-to-ee-2018-07-26' into 'master' · 4f991989
  Clement Ho authored Jul 26, 2018
```
CE upstream - 2018-07-26 03:21 UTC

Closes gitlab-ui#11

See merge request gitlab-org/gitlab-ee!6674
```
  4f991989
- Merge branch '48985-diverged-from-upstream-label' into 'master' · 13ad6e09
  Clement Ho authored Jul 26, 2018
```
Add left-padding to diverged-from-upstream label

Closes #7007

See merge request gitlab-org/gitlab-ee!6647
```
  13ad6e09
- Merge branch 'full-list-of-vulnerabilities-5239' into 'master' · 8e675082
  Phil Hughes authored Jul 26, 2018
```
Full list of vulnerabilities

See merge request gitlab-org/gitlab-ce!20855
```
  8e675082
- Full list of vulnerabilities · da20731f
  Sam Beckham authored Jul 26, 2018
  
  da20731f
- Merge branch 'ee-full-list-of-vulnerabilities-5239' into 'master' · 6d4e7d7a
  Phil Hughes authored Jul 26, 2018
```
Full list of vulnerabilities

Closes #5239

See merge request gitlab-org/gitlab-ee!6675
```
  6d4e7d7a
- Full list of vulnerabilities · b5f65f51
  Sam Beckham authored Jul 26, 2018
  
  b5f65f51
- Merge branch 'master' into ce-to-ee-2018-07-26 · 238c8c3e
  Clement Ho authored Jul 26, 2018
  
  238c8c3e
- Merge branch 'remove-unnecessary-css' into 'master' · ef455b5d
  Clement Ho authored Jul 26, 2018
```
Remove CSS

See merge request gitlab-org/gitlab-ce!20845
```
  ef455b5d
- Merge branch 'update-danger-image' into 'master' · f055b87e
  Robert Speicher authored Jul 26, 2018
```
Update the image for the 'danger-review' job

See merge request gitlab-org/gitlab-ce!20856
```
  f055b87e
- Merge branch '48055-web-ide-resize-handles' into 'master' · 9ea2e664
  Phil Hughes authored Jul 26, 2018
```
Resolve "Resize handles for Web IDE right sidebar are too thin"

Closes #48055

See merge request gitlab-org/gitlab-ce!20818
```
  9ea2e664
- Merge branch '48636-new-mr-card-styles' into 'master' · 4cebdbbe
  Clement Ho authored Jul 26, 2018
```
Resolve "BS4: Create new Merge request boxes have different styles"

Closes #48636

See merge request gitlab-org/gitlab-ce!20822
```
  4cebdbbe