Commits · ea680b73dedbe029f58857eccb9e1f1489f2de35 · nexedi / gitlab-ce

26 Apr, 2018 2 commits
- specs · ea680b73
  Phil Hughes authored Apr 26, 2018
  
  ea680b73
- Merge branch 'ide-workbench-bar' into ide-activity-bar-review-mode · c83ed559
  Phil Hughes authored Apr 26, 2018
  
  c83ed559
25 Apr, 2018 7 commits
- fixed commit files not opening correctly · 9f35f6d9
  Phil Hughes authored Apr 25, 2018
  
  9f35f6d9
- fixed eslint · af507c79
  Phil Hughes authored Apr 25, 2018
  
  af507c79
- fixed alignment of new dropdown in file rows · 272b8f3f
  Phil Hughes authored Apr 25, 2018
```
fixed bad merge resolutions
```
  272b8f3f
- Merge branch 'master' into ide-workbench-bar · 7adbed74
  Phil Hughes authored Apr 25, 2018
  
  7adbed74
- Merge branch 'align-project-avatar-on-small-viewports' into 'master' · b36941bd
  Phil Hughes authored Apr 25, 2018
```
Align project avatar on small viewports

Closes #36585

See merge request gitlab-org/gitlab-ce!18513
```
  b36941bd
- Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' into 'master' · e6f6f8e7
  Rémy Coutable authored Apr 25, 2018
```
Backport dev env check for storage settings deprecation

See merge request gitlab-org/gitlab-ce!18461
```
  e6f6f8e7
- Merge branch 'fix-settings-preloading' into 'master' · 772b6b08
  Rémy Coutable authored Apr 25, 2018
```
Do not preload settings

See merge request gitlab-org/gitlab-ce!18566
```
  772b6b08
24 Apr, 2018 31 commits
- Merge branch 'winh-mock-pager' into 'master' · ab7b01aa
  Clement Ho authored Apr 24, 2018
```
Mock Pager in Karma tests

See merge request gitlab-org/gitlab-ce!18556
```
  ab7b01aa
- Mock Pager in Karma tests · 92be3461
  Winnie Hellmann authored Apr 24, 2018
  
  92be3461
- Backport dev env check for storage settings deprecation · 132f7d33
  Oswaldo Ferreira authored Apr 18, 2018
  
  132f7d33
- Do not preload settings · 575302c1
  Kamil Trzciński authored Apr 24, 2018
  
  575302c1
- Merge branch '45725-broken-master' into 'master' · 87cdd43b
  Clement Ho authored Apr 24, 2018
```
Resolve "Broken master with `static_analysis` and `karma` being broken"

Closes #45725

See merge request gitlab-org/gitlab-ce!18569
```
  87cdd43b
- Update import on actions file to fix conflict when rewire plugin was added · e73b9812
  Filipa Lacerda authored Apr 24, 2018
  
  e73b9812
- Merge branch 'patch-29' into 'master' · 1aa11de1
  Rémy Coutable authored Apr 24, 2018
```
Broken link fix

See merge request gitlab-org/gitlab-ce!18564
```
  1aa11de1
- Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master' · 878ad484
  Rémy Coutable authored Apr 24, 2018
```
Add copy_metadata quick action

Closes #38450

See merge request gitlab-org/gitlab-ce!18497
```
  878ad484
- Merge branch 'bvl-fix-maintainer-push-error' into 'master' · 906fc00c
  Douwe Maan authored Apr 24, 2018
```
Fix errors on pushing/editing files on empty repositories

Closes #44618 and #42583

See merge request gitlab-org/gitlab-ce!18462
```
  906fc00c
- Merge branch 'jr-40616-external-lfs-docs' into 'master' · 17ffd998
  Douwe Maan authored Apr 24, 2018
```
Add documentation for externally hosted LFS objects

See merge request gitlab-org/gitlab-ce!18508
```
  17ffd998
- Merge branch '30998-add-babel-rewire-plugin' into 'master' · b173e564
  Clement Ho authored Apr 24, 2018
```
Resolve "Add some way to mock and spy on default ES modules"

Closes #30998

See merge request gitlab-org/gitlab-ce!18116
```
  b173e564
- Broken link fix · 52dfdcf7
  Ana Karabanova 🐱 authored Apr 24, 2018
  
  52dfdcf7
- Merge branch 'master' into matbaj/gitlab-ce-add-inherit-command · 6a88ffb4
  Sean McGivern authored Apr 24, 2018
  
  6a88ffb4
- Merge branch '4950-unassign-slash-command-preview-fix' into 'master' · 8b41c406
  Sean McGivern authored Apr 24, 2018
```
Fix unassign slash command preview

See merge request gitlab-org/gitlab-ce!18447
```
  8b41c406
- Fix unassign slash command preview · 36dc28fd
  Athar Hameed authored Apr 24, 2018
  
  36dc28fd
- Merge branch... · c7b12a41
  Grzegorz Bizon authored Apr 24, 2018
```
Merge branch '43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master'

Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries"

Closes #43111

See merge request gitlab-org/gitlab-ce!18561
```
  c7b12a41
- Make /copy_metadata only handle the first issuable passed · db377437
  Sean McGivern authored Apr 20, 2018
  
  db377437
- Allow admins to push to empty repos · 35a49922
  Bob Van Landuyt authored Apr 18, 2018
  
  35a49922
- Merge branch 'show-runners-description-on-jobs-page' into 'master' · b2041d1e
  Kamil Trzciński authored Apr 24, 2018
```
Show Runner's description on job's page

See merge request gitlab-org/gitlab-ce!17321
```
  b2041d1e
- Only show push-to-master authorized users · aeed6b5a
  Bob Van Landuyt authored Apr 18, 2018
```
Hide the push to master instructions for users that are not allowed to
do that.

Also hide buttons that would direct them to commit directly in master
```
  aeed6b5a
- Document externally hosted LFS objects · faa7ff3e
  James Ramsay authored Apr 20, 2018
```
API can be used by project owners to disable LFS object verification
that will block pushes that contain LFS pointers but no the objects.
```
  faa7ff3e
- Add CHANGELOG entry · d9325335
  Tomasz Maczukin authored Apr 05, 2018
  
  d9325335
- Show Runner's description on job's page · d71193a0
  Tomasz Maczukin authored Feb 23, 2018
  
  d71193a0
- Fix an N+1 for MRs from forks on the MR index page · 943fc87d
  Sean McGivern authored Apr 24, 2018
  
  943fc87d
- Merge branch '10244-add-project-ci-cd-settings' into 'master' · f5524d55
  Kamil Trzciński authored Apr 24, 2018
```
Introduce new ProjectCiCdSettings model with group_runners_enabled

See merge request gitlab-org/gitlab-ce!18144
```
  f5524d55
- Merge branch 'fj-45057-improve-ssrf-documentation' into 'master' · 26147b73
  Douwe Maan authored Apr 24, 2018
```
Improve documentation of SSRF protection

Closes #45057

See merge request gitlab-org/gitlab-ce!18532
```
  26147b73
- Improve documentation of SSRF protection · 6d3121be
  Francisco Javier López authored Apr 24, 2018
  
  6d3121be
- Merge branch 'jej/refactor-omniauth-controller' into 'master' · 1e624f34
  Douwe Maan authored Apr 24, 2018
```
Refactor OmniauthCallbacksController to remove duplication

Closes #26559

See merge request gitlab-org/gitlab-ce!16694
```
  1e624f34
- Merge branch 'bvl-warn-if-move-fails-on-mountpoint' into 'master' · d210c6b6
  Douwe Maan authored Apr 24, 2018
```
Warning when restore fails when data-dir is a moint point

Closes #19309

See merge request gitlab-org/gitlab-ce!18533
```
  d210c6b6
- Merge branch 'ide-file-finder' into 'master' · bb8e4268
  Filipa Lacerda authored Apr 24, 2018
```
Added fuzzy file finder to web IDE

Closes #44841

See merge request gitlab-org/gitlab-ce!18323
```
  bb8e4268
- Merge branch 'sh-bump-lograge' into 'master' · b0f7ab7f
  Rémy Coutable authored Apr 24, 2018
```
Bump lograge to 0.10.0 and remove monkey patch

See merge request gitlab-org/gitlab-ce!18551
```
  b0f7ab7f