Commits · ae41ebd7ab3dbcd768610140ba98e8c833ffc536 · nexedi / gitlab-ce

04 May, 2018 9 commits
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-04 · ae41ebd7
  GitLab Bot authored May 04, 2018
```
# Conflicts:
#	app/models/group.rb
#	db/schema.rb
#	lib/api/entities.rb
#	spec/serializers/pipeline_serializer_spec.rb

[ci skip]
```
  ae41ebd7
- Merge branch 'feature/runner-per-group' into 'master' · 04d07cc5
  Kamil Trzciński authored May 04, 2018
```
Shared CI runners for groups

See merge request gitlab-org/gitlab-ce!9646
```
  04d07cc5
- Merge branch 'ce-to-ee-2018-05-03' into 'master' · 47083508
  Rémy Coutable authored May 04, 2018
```
CE upstream - 2018-05-03 18:26 UTC

See merge request gitlab-org/gitlab-ee!5567
```
  47083508
- Merge branch '5740-mirroring-paused-link-is-invalid' into 'master' · 377a33c3
  Douwe Maan authored May 04, 2018
```
Resolve ""Repository mirroring paused" email link is invalid"

Closes #5740

See merge request gitlab-org/gitlab-ee!5546
```
  377a33c3
- Resolve conflict in LICENSE · 12a9c3a1
  Rémy Coutable authored May 04, 2018
  
  12a9c3a1
- Merge branch 'jej/identity-relates-to-saml' into 'master' · a54ceb04
  Douwe Maan authored May 04, 2018
```
SamlProvider has many linked Identities

See merge request gitlab-org/gitlab-ee!5507
```
  a54ceb04
- Merge branch 'rs-remove-admin-user-badge-counts' into 'master' · bee5e26e
  Douwe Maan authored May 04, 2018
```
Perform a limited count for the badge counts for tabs in the Users admin area

Closes #33927

See merge request gitlab-org/gitlab-ce!18661
```
  bee5e26e
- Make add_index_to_namespaces_runners_token migration reversible · 11f38dd1
  Dylan Griffith authored May 04, 2018
  
  11f38dd1
- Merge branch 'pravi/gitlab-ce-update-grape-entity' into 'master' · 31fa9696
  Stan Hu authored May 04, 2018
```
Update grape-entity 0.6.0 -> 0.7.1

See merge request gitlab-org/gitlab-ce!18720
```
  31fa9696
03 May, 2018 31 commits
- Merge branch 'break-issue-title-for-board-card-title-and-issueable-header-text' into 'master' · ef1bdc44
  Clement Ho authored May 03, 2018
```
Break issue title for board card title and issuable header text

Closes #45940

See merge request gitlab-org/gitlab-ce!18674
```
  ef1bdc44
- Merge branch 'add-loading-icon-padding-for-pipeline-environments' into 'master' · 76ab3f01
  Tim Zallmann authored May 03, 2018
```
Add loading icon padding for pipeline environments

See merge request gitlab-org/gitlab-ce!18631
```
  76ab3f01
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-05-03 · 75c02edb
  GitLab Bot authored May 03, 2018
```
# Conflicts:
#	LICENSE

[ci skip]
```
  75c02edb
- Merge branch 'move-time-tracking-spent-only-pane-vue-component' into 'master' · 622aeea9
  Phil Hughes authored May 03, 2018
```
Move TimeTrackingSpentOnlyPane vue component

See merge request gitlab-org/gitlab-ce!18710
```
  622aeea9
- Merge branch 'ee-move-time-tracking-spent-only-pane-vue-component' into 'master' · 2963bc01
  Phil Hughes authored May 03, 2018
```
Move TimeTrackingSpentOnlyPane vue component

See merge request gitlab-org/gitlab-ee!5559
```
  2963bc01
- Merge branch 'add-padding-to-profile-description' into 'master' · acae51fe
  Phil Hughes authored May 03, 2018
```
Add padding to profile description

Closes #35727

See merge request gitlab-org/gitlab-ce!18663
```
  acae51fe
- Merge branch 'ide-tree-changes-count' into 'master' · bb3beb5e
  Filipa Lacerda authored May 03, 2018
```
Added changes count to web IDE folder

See merge request gitlab-org/gitlab-ce!18452
```
  bb3beb5e
- Changes HTML version of mirror was hard failed email to use full path instead... · 6aec3aa4
  Tiago Botelho authored May 02, 2018
```
Changes HTML version of mirror was hard failed email to use full path instead of relative path for the project
```
  6aec3aa4
- Merge branch 'change-docs-license' into 'master' · 48308728
  Rémy Coutable authored May 03, 2018
```
Change the docs license to CC BY-SA

See merge request gitlab-org/gitlab-ce!18718
```
  48308728
- Merge branch 'change-docs-license-ee' into 'master' · 5d5f6ed7
  Rémy Coutable authored May 03, 2018
```
Change the docs license to CC BY-SA

See merge request gitlab-org/gitlab-ee!5565
```
  5d5f6ed7
- Merge branch 'update-omniauth-github' into 'master' · 969f3a9a
  Rémy Coutable authored May 03, 2018
```
update omniauth-github ~> 1.1.1 to ~> 1.3

See merge request gitlab-org/gitlab-ce!18668
```
  969f3a9a
- SamlProvider has many linked Identities · 4f37994d
  James Edwards-Jones authored Apr 22, 2018
  
  4f37994d
- Fix lambda arguments in Grape entities · e50bed7e
  Rémy Coutable authored May 03, 2018
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
  e50bed7e
- Update grape-entity 0.6.0 -> 0.7.1 · 829441dc
  Pirate Praveen authored Apr 04, 2018
  
  829441dc
- Merge branch 'ce-to-ee-2018-05-03' into 'master' · 133568f4
  Robert Speicher authored May 03, 2018
```
CE upstream - 2018-05-03 13:09 UTC

Closes gitaly#1146

See merge request gitlab-org/gitlab-ee!5561
```
  133568f4
- Fix constants in backfill_runner_type_for_ci_runners_post_migrate.rb · ed9b285b
  Dylan Griffith authored May 03, 2018
  
  ed9b285b
- Use limited_counter_with_delimiter in the admin user list tabs · 322b5d12
  Robert Speicher authored May 03, 2018
```
This drastically reduces page load times at gitlab.com scale.
```
  322b5d12
- Remove a warning from spec/features/admin/admin_users_spec.rb · 8e7b12ae
  Robert Speicher authored May 03, 2018
  
  8e7b12ae
- Use smallint for runner_type since its an enum · cb49d68c
  Dylan Griffith authored May 03, 2018
  
  cb49d68c
- Resolve app/models/identity.rb · 83ce8f66
  Robert Speicher authored May 03, 2018
  
  83ce8f66
- Dont remove duplicates in Runner.owned_or_shared since its not necessary · 15b10c34
  Dylan Griffith authored May 03, 2018
  
  15b10c34
- Change the docs license to CC BY-SA · 52e8f611
  Achilleas Pipinellis authored May 03, 2018
```
As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
```
  52e8f611
- Change the docs license to CC BY-SA · ab68ad87
  Achilleas Pipinellis authored May 03, 2018
```
As discussed in https://gitlab.com/gitlab-org/gitlab-ce/issues/42891
```
  ab68ad87
- Remove unnecessary disable transaction in add_ci_runner_namespaces · b8abe0c9
  Dylan Griffith authored May 03, 2018
  
  b8abe0c9
- Split migration to add and index namespaces.runners_token · dd74237d
  Dylan Griffith authored May 03, 2018
  
  dd74237d
- Merge branch 'tc-geo-fix-daemon-log-class' into 'master' · 4ed3c823
  Nick Thomas authored May 03, 2018
```
Refactor the Geo LogCursor Logger to make class more descriptive

Closes #5632

See merge request gitlab-org/gitlab-ee!5483
```
  4ed3c823
- Merge branch 'bw-add-console-message' into 'master' · 7ff891e5
  Robert Speicher authored May 03, 2018
```
Output some useful information when running the rails console

See merge request gitlab-org/gitlab-ce!18697
```
  7ff891e5
- Output some useful information when running the rails console · ec548983
  Brett Walker authored May 03, 2018
  
  ec548983
- ensure users are signed out properly in user_uses_slash_commands_spec.rb · fb681f68
  Lukas Eipert authored May 03, 2018
```
See https://gitlab.com/gitlab-org/gitlab-ce/issues/45970
```
  fb681f68
- Move TimeTrackingSpentOnlyPane vue component · bbae5109
  George Tsiolis authored May 03, 2018
  
  bbae5109
- Fixes doc/topics/autodevops/index.md conflicts · d0395212
  Mayra Cabrera authored May 03, 2018
  
  d0395212