Commits · 636bc3493c8743fec0f091812f283863dcdd6bb2 · nexedi / gitlab-ce

01 Jun, 2018 1 commit
- Do not update stage status when it is just created · 636bc349
  Grzegorz Bizon authored May 25, 2018
  
  636bc349
25 May, 2018 1 commit
- Fix pipelines serializer with preloading pagination · e0837df8
  Grzegorz Bizon authored May 25, 2018
  
  e0837df8
24 May, 2018 2 commits
- Adjust pipeline serialization queries amount in EE · 3f76a976
  Grzegorz Bizon authored May 24, 2018
  
  3f76a976
- Reduce pipeline serialization queries when preloaded · 01792f50
  Grzegorz Bizon authored May 24, 2018
  
  01792f50
23 May, 2018 17 commits
- Reduce amount of expected pipeline serialization queries in specs · 7ebafe16
  Grzegorz Bizon authored May 23, 2018
```
Conflicts:
	spec/serializers/pipeline_serializer_spec.rb
```
  7ebafe16
- Fix Rubocop offense in grouped statuses class specs · 1771d181
  Grzegorz Bizon authored May 23, 2018
  
  1771d181
- Do not paginate pipelines active relation twice · 2e7965e9
  Grzegorz Bizon authored May 23, 2018
  
  2e7965e9
- DRY creating groups of common builds in a stage · 6e015c2b
  Grzegorz Bizon authored May 23, 2018
  
  6e015c2b
- Simplify pipelines preloader implementation · 4ffd764c
  Grzegorz Bizon authored May 23, 2018
  
  4ffd764c
- Fix rubocop offense in pipeline controller specs 👮 · 6809353d
  Grzegorz Bizon authored May 22, 2018
```
Conflicts:
	app/controllers/projects/pipelines_controller.rb
```
  6809353d
- Fix memoization-related rubocop offense in project · 96c3f3c7
  Grzegorz Bizon authored May 22, 2018
  
  96c3f3c7
- Add pipeline stages factory method import/export support · 1af5b71d
  Grzegorz Bizon authored May 22, 2018
  
  1af5b71d
- Refactor pipeline preloader to split reponsibilities better · f3c415d3
  Grzegorz Bizon authored May 22, 2018
  
  f3c415d3
- Abstract persisted/legacy stages in pipeline model · 66b97bc2
  Grzegorz Bizon authored May 22, 2018
```
Conflicts:
	app/controllers/projects/pipelines_controller.rb
```
  66b97bc2
- Order pipeline stages by a position in a relation · 9d1b37c3
  Grzegorz Bizon authored May 22, 2018
```
Conflicts:
	app/models/ci/pipeline.rb
```
  9d1b37c3
- Preload number of warnings in every stage in a pipeline · 4264ba02
  Grzegorz Bizon authored May 22, 2018
```
This makes it possible to avoid N+1 queries when loading pipelines
table.
```
  4264ba02
- Memoize project active runners to avoid N+1 queries · c50dc610
  Grzegorz Bizon authored May 22, 2018
  
  c50dc610
- Use persisted stages to load pipelines index table · 77c44f59
  Grzegorz Bizon authored May 21, 2018
```
Conflicts:
	app/controllers/projects/pipelines_controller.rb
	app/models/ci/pipeline.rb
```
  77c44f59
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 8d8c89ff
  Grzegorz Bizon authored May 23, 2018
```
CE upstream - 2018-05-22 21:23 UTC

See merge request gitlab-org/gitlab-ee!5814
```
  8d8c89ff
- resolve conflict in locale/gitlab.pot · bd7061ba
  Lukas Eipert authored May 23, 2018
  
  bd7061ba
- No deeplink needed · 5159a479
  Sid Sijbrandij authored May 23, 2018
  
  5159a479
22 May, 2018 19 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · a3859c0f
  GitLab Bot authored May 22, 2018
```
# Conflicts:
#	locale/gitlab.pot

[ci skip]
```
  a3859c0f
- Merge branch '44895-explicit-merge-conflict' into 'master' · 76e276cb
  Tim Zallmann authored May 22, 2018
```
Resolve "Make explicit that merge conflict feature commits to source branch"

Closes #44895

See merge request gitlab-org/gitlab-ce!18921
```
  76e276cb
- Merge branch 'silver-to-premium' into 'master' · 49478523
  Victor Wu authored May 22, 2018
```
Update Silver to say Premium

See merge request gitlab-org/gitlab-ee!5812
```
  49478523
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · e205e4b0
  Stan Hu authored May 22, 2018
```
CE upstream - 2018-05-22 18:27 UTC

See merge request gitlab-org/gitlab-ee!5811
```
  e205e4b0
- Update Silver to say Premium · 87d25d5c
  Victor Wu authored May 22, 2018
  
  87d25d5c
- Merge branch 'winh-make-it-right-now' into 'master' · 4c63e904
  Annabel Gray authored May 22, 2018
```
Use "right now" for short time periods

Closes #40563

See merge request gitlab-org/gitlab-ce!19095
```
  4c63e904
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-22 · f7c55b83
  GitLab Bot authored May 22, 2018
  
  f7c55b83
- Use "right now" for short time periods · 1d6025fd
  Winnie Hellmann authored May 22, 2018
  
  1d6025fd
- Merge branch 'ce-to-ee-2018-05-22' into 'master' · 87aef527
  Rémy Coutable authored May 22, 2018
```
CE upstream - 2018-05-22 12:51 UTC

See merge request gitlab-org/gitlab-ee!5804
```
  87aef527
- Merge branch '5919_follow_up_on_5151_dismiss_vulnerability' into 'master' · 36c98d24
  Robert Speicher authored May 22, 2018
```
Resolve Follow up on dismiss vulnerability or create issue

See merge request gitlab-org/gitlab-ee!5756
```
  36c98d24
- Resolve Follow up on dismiss vulnerability or create issue · a79d5d85
  Olivier Gonzalez authored May 22, 2018
  
  a79d5d85
- Merge branch 'dm-xcode-project-directory' into 'master' · f8568baa
  Robert Speicher authored May 22, 2018
```
Fix Xcode project detection by looking for dirs instead of files

See merge request gitlab-org/gitlab-ce!19035
```
  f8568baa
- Merge branch 'fix/unverified-hover-state' into 'master' · 5045ca06
  Annabel Gray authored May 22, 2018
```
unverified hover state color changed to almost-black

See merge request gitlab-org/gitlab-ce!19031
```
  5045ca06
- unverified hover state color changed to almost-black · 683f9720
  Murat Dogan authored May 22, 2018
  
  683f9720
- Merge branch 'workhorse-4.2.1' into 'master' · f80ba922
  Alessio Caiazza authored May 22, 2018
```
Upgrade workhorse to v4.2.1

See merge request gitlab-org/gitlab-ce!19087
```
  f80ba922
- Merge branch 'dz-no-ee-check' into 'master' · 0c977d17
  Rémy Coutable authored May 22, 2018
```
Add check for top-level ee directory in CE repo

Closes #46239

See merge request gitlab-org/gitlab-ce!19062
```
  0c977d17
- They're not EE specific but a delay from CE -> EE · a40f2fd4
  Lin Jen-Shin authored May 23, 2018
  
  a40f2fd4
- Remove ee/spec/features/projects/active_tabs_spec.rb · 78e3f835
  Rémy Coutable authored May 22, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  78e3f835
- Merge branch... · 86c155a1
  Douwe Maan authored May 22, 2018
```
Merge branch '22846-notifications-broken-during-email-address-change-before-email-confirmed' into 'master'

Resolve "notifications broken during email address change before email confirmed"

Closes #22846

See merge request gitlab-org/gitlab-ce!18474
```
  86c155a1