Commits · 7b437396ace68ac02d960291ba2fc624b05c19ba · nexedi / gitlab-ce

22 Mar, 2018 8 commits
- Start building abstraction over pipeline seeds · 7b437396
  Grzegorz Bizon authored Mar 21, 2018
  
  7b437396
- Instantiate pipeline stages and builds before saving · 83367ed2
  Grzegorz Bizon authored Mar 19, 2018
  
  83367ed2
- Merge branch 'ee-move-email-footer-info-to-single-line' into 'master' · edd95e13
  Filipa Lacerda authored Mar 22, 2018
```
Move email footer info to a single line -- EE merge edition

See merge request gitlab-org/gitlab-ee!5066
```
  edd95e13
- Merge branch '4310-security-reports-break-utils' into 'master' · f92722ac
  Phil Hughes authored Mar 22, 2018
```
Break utils functions for security issues

See merge request gitlab-org/gitlab-ee!5064
```
  f92722ac
- Update CHANGELOG.md for 10.6.0 · 4f41e81d
  James Lopez authored Mar 22, 2018
```
[ci skip]
```
  4f41e81d
- Update CHANGELOG-EE.md for 10.6.0-ee · b19001ef
  James Lopez authored Mar 22, 2018
```
[ci skip]
```
  b19001ef
- Merge branch 'da-scheduler-rescheduling-the-same-project' into 'master' · d1f3c4d4
  Stan Hu authored Mar 22, 2018
```
Geo - Avoid rescheduling the same project again in a backfill condition

See merge request gitlab-org/gitlab-ee!5069
```
  d1f3c4d4
- Merge remote-tracking branch 'dev/master' · 69cf81e4
  Robert Speicher authored Mar 21, 2018
  
  69cf81e4
21 Mar, 2018 28 commits
- Add CHANGELOG · edb26302
  Douglas Barbosa Alexandre authored Mar 21, 2018
  
  edb26302
- Avoid rescheduling the same project again in a backfill condition · 2040d996
  Douglas Barbosa Alexandre authored Mar 21, 2018
  
  2040d996
- Move email footer info to a single line (EE) · 63370ef9
  Eric Eastwood authored Mar 21, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17916
```
  63370ef9
- Move email footer info to a single line · 89f26030
  Eric Eastwood authored Mar 21, 2018
```
From
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5031#note_64372406
```
  89f26030
- Merge branch 'ce-to-ee-2018-03-21' into 'master' · ec67a370
  Robert Speicher authored Mar 21, 2018
```
CE upstream - 2018-03-21 00:25 UTC

See merge request gitlab-org/gitlab-ee!5054
```
  ec67a370
- Merge branch 'add-chatops-docs' into 'master' · 2a6d6bb0
  Marcia Ramos authored Mar 21, 2018
```
Add docs for ChatOps

See merge request gitlab-org/gitlab-ee!5033
```
  2a6d6bb0
- Add docs for ChatOps · 801cf1e9
  Joshua Lambert authored Mar 21, 2018
  
  801cf1e9
- Merge branch... · d460490c
  Douwe Maan authored Mar 21, 2018
```
Merge branch '5358-hard-failing-mirror-fails-for-personal-project-with-blocked-owners' into 'master'

Resolve "Hard-failing a mirror fails for personal projects with blocked owners"

Closes #5358

See merge request gitlab-org/gitlab-ee!5063
```
  d460490c
- Remove toolbar spec · d2df69e5
  Clement Ho authored Mar 21, 2018
  
  d2df69e5
- Merge branch 'tc-geo-primary-prometheus' into 'master' · 9e9748e6
  Nick Thomas authored Mar 21, 2018
```
Also log Prometheus metrics from the primary

Closes #5373

See merge request gitlab-org/gitlab-ee!5058
```
  9e9748e6
- Hard failing mirror no longer fails for personal project of a blocked user · 37afc065
  Tiago Botelho authored Mar 21, 2018
  
  37afc065
- Break utils function for sast and codeclimate · ef93144b
  Filipa Lacerda authored Mar 21, 2018
  
  ef93144b
- Merge branch 'move-db-migrate-ee' into 'master' · ede41e63
  Douwe Maan authored Mar 21, 2018
```
Move db/migrate/20171222151344_add_regexp_uses_re2_to_push_rules.rb

See merge request gitlab-org/gitlab-ee!5060
```
  ede41e63
- Also log Prometheus metrics from the primary · 2a479268
  Toon Claes authored Mar 21, 2018
```
Closes gitlab-org/gitlab-ee#5373.
```
  2a479268
- Merge branch 'da-repository-verification' into 'master' · be832e63
  Nick Thomas authored Mar 21, 2018
```
Geo - Switch from time-based checking of outdated checksums to the nil-checksum-based approach

Closes #5176 and #5346

See merge request gitlab-org/gitlab-ee!4910
```
  be832e63
- Geo - Switch from time-based checking of outdated checksums to the nil-checksum-based approach · 1f004e12
  Douglas Barbosa Alexandre authored Mar 21, 2018
  
  1f004e12
- Merge branch 'fix-typo-in-k8s-cluster-docs' into 'master' · 78240f13
  Marcia Ramos authored Mar 21, 2018
```
Improve wording of cluster monitoring docs

See merge request gitlab-org/gitlab-ee!5056
```
  78240f13
- Merge branch 'bw-fix-job-artifacts-table' into 'master' · 21158b9d
  Nick Thomas authored Mar 21, 2018
```
fix spelling of fdw table name that caused 500 error

See merge request gitlab-org/gitlab-ee!5040
```
  21158b9d
- fix spelling of fdw table name that caused 500 error · 7bb1227f
  Brett Walker authored Mar 21, 2018
  
  7bb1227f
- Move db/migrate/20171222151344_add_regexp_uses_re2_to_push_rules.rb · e3f4377c
  Lin Jen-Shin authored Mar 21, 2018
```
to ee directory.
```
  e3f4377c
- Merge branch 'ee-fix-confirm-danger-modal' into 'master' · 87f19344
  Filipa Lacerda authored Mar 21, 2018
```
Port of "Refactor ConfirmDangerModal into ES module" to EE

See merge request gitlab-org/gitlab-ee!5044
```
  87f19344
- Merge branch 'dz-memorize-report-artifacts' into 'master' · a1ae56b8
  Sean McGivern authored Mar 21, 2018
```
Merorize report artifacts into instance variables

See merge request gitlab-org/gitlab-ee!5016
```
  a1ae56b8
- Merge branch 'ee-make-ide-ce' into 'master' · 0ff24c10
  Tim Zallmann authored Mar 21, 2018
```
EE port of make-ide-ce

See merge request gitlab-org/gitlab-ee!5045
```
  0ff24c10
- Fix and improve wording · d6276419
  Joshua Lambert authored Mar 20, 2018
  
  d6276419
- Merge branch 'jramsay-github-ci-docs' into 'master' · 586c6506
  Marcia Ramos authored Mar 21, 2018
```
Add step by step guides for GitLab CI/CD for GitHub and Bitbucket

Closes #5108

See merge request gitlab-org/gitlab-ee!5025
```
  586c6506
- Add step by step guides for GitLab CI/CD for GitHub and Bitbucket · 0cab0d1d
  James Ramsay authored Mar 21, 2018
  
  0cab0d1d
- "Resolve" non-existing conflicts, question mark? · 60482bbb
  Robert Speicher authored Mar 20, 2018
  
  60482bbb
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-21 · 05f5a647
  GitLab Bot authored Mar 21, 2018
```
# Conflicts:
#	spec/javascripts/vue_shared/components/markdown/toolbar_spec.js

[ci skip]
```
  05f5a647
20 Mar, 2018 4 commits
- Merge branch '3952-planned-failover-docs' into 'master' · c1e58c52
  Stan Hu authored Mar 20, 2018
```
Resolve "Geo DR: planned failover (including of a multi-node secondary)"

Closes #3952

See merge request gitlab-org/gitlab-ee!4920
```
  c1e58c52
- Merge branch 'docs-fe-monitoring' into 'master' · 78878355
  Clement Ho authored Mar 20, 2018
```
Add performance monitoring docs for the new FE guide

See merge request gitlab-org/gitlab-ce!17809
```
  78878355
- Added monitoring docs · 9eb30418
  Jose Ivan Vargas authored Mar 16, 2018
  
  9eb30418
- Merge branch 'update-spec-import-path-for-vue-mount-component-helper' into 'master' · 38632aa5
  Clement Ho authored Mar 20, 2018
```
Update spec import path for vue mount component helper

See merge request gitlab-org/gitlab-ce!17880
```
  38632aa5