Commits · 805302c0c09f0c6a3226efd2d3fca1b46015f9e0 · Forest Godfrey / gitlab-ce

04 May, 2018 17 commits
- fixed duplicated tests · 805302c0
  Phil Hughes authored May 04, 2018
  
  805302c0
- removed conflict markers · 64807dd8
  Phil Hughes authored May 04, 2018
  
  64807dd8
- Merge branch 'master' into 44846-improve-web-ide-left-panel-and-modes · d9f3af50
  Phil Hughes authored May 04, 2018
  
  d9f3af50
- Merge branch 'gitaly-note-duplication' into 'master' · 2d23cb1b
  Douwe Maan authored May 04, 2018
```
Add note about rebase/squash duplication in Gitaly

See merge request gitlab-org/gitlab-ce!18741
```
  2d23cb1b
- Update repository.rb · 8cbabe43
  Kim Carlbäcker authored May 04, 2018
  
  8cbabe43
- Merge branch 'inform-the-user-when-there-are-no-project-import-options-available' into 'master' · 96373b0b
  Rémy Coutable authored May 04, 2018
```
Inform the user when there are no project import options available

Closes #45987

See merge request gitlab-org/gitlab-ce!18716
```
  96373b0b
- Add note about rebase/squash duplication in Gitaly · 3fe555a7
  Kim Carlbäcker authored May 04, 2018
  
  3fe555a7
- Merge branch 'winh-vue-templates-docs' into 'master' · 4cfa8168
  Filipa Lacerda authored May 04, 2018
```
Clarify location of Vue templates

See merge request gitlab-org/gitlab-ce!18733
```
  4cfa8168
- Merge branch '36762-reconcile-project-templates-with-auto-devops' into 'master' · 073c1a0e
  Kamil Trzciński authored May 04, 2018
```
Resolve "Reconcile project templates with Auto DevOps"

Closes #36762

See merge request gitlab-org/gitlab-ce!18737
```
  073c1a0e
- Resolve "Reconcile project templates with Auto DevOps" · 1d74a0e9
  Fabio Busatto authored May 04, 2018
  
  1d74a0e9
- 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
- Move import project pane to a separate partial · 337ceb17
  George Tsiolis authored May 04, 2018
  
  337ceb17
- 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
- Inform the user when there are no project import options available · b570bd46
  George Tsiolis authored May 03, 2018
  
  b570bd46
- Clarify location of Vue templates · 7f107539
  Winnie Hellmann authored May 04, 2018
  
  7f107539
- 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 23 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 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 '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
- 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 '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
- 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
- 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
- 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
- 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 '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
- Revert "Use factory in specs for ProjectCiCdSettings" · 794ac6c5
  Dylan Griffith authored May 03, 2018
```
This reverts commit bf790c26.
```
  794ac6c5
- fixed specs · fa8d70a9
  Phil Hughes authored May 03, 2018
```
fixed review mode not being editable
```
  fa8d70a9
- Merge branch '45970-additional-signout-needed' into 'master' · 17f598e9
  Douwe Maan authored May 03, 2018
```
Ensure that spec/features/issues/user_uses_slash_commands_spec tests run locally

Closes #45970

See merge request gitlab-org/gitlab-ce!18713
```
  17f598e9
- Order builds by id instead of created_at in RegisterJobService · 0ae30057
  Dylan Griffith authored May 03, 2018
  
  0ae30057