Commits · 1880809d8ef9b650d1af615ebbaa590626ccf17f · nexedi / gitlab-ce

29 Nov, 2017 1 commit
- added editor options to redcue EE conflicts · 1880809d
  Phil Hughes authored Nov 29, 2017
  
  1880809d
28 Nov, 2017 14 commits
- fixed failing specs · d22bb039
  Phil Hughes authored Nov 28, 2017
  
  d22bb039
- fixed scss-lint · 5fceb8d1
  Phil Hughes authored Nov 28, 2017
  
  5fceb8d1
- added specs · 061be86e
  Phil Hughes authored Nov 28, 2017
  
  061be86e
- fixed web worker performance · fd818194
  Phil Hughes authored Nov 22, 2017
```
[ci skip]
```
  fd818194
- added web worker to calculate diffs · 3a1c3c5d
  Phil Hughes authored Nov 22, 2017
```
[ci skip]
```
  3a1c3c5d
- started move to web worker for diff calculation · 809a27e6
  Phil Hughes authored Nov 22, 2017
  
  809a27e6
- changed endLineNumber calculation · 7c04e408
  Phil Hughes authored Nov 22, 2017
```
[ci skip]
```
  7c04e408
- change how diffing works · caa2f10e
  Phil Hughes authored Nov 22, 2017
```
[ci skip]
```
  caa2f10e
- added disposable manager · eb8a6095
  Phil Hughes authored Nov 21, 2017
```
added model manager

[ci skip]
```
  eb8a6095
- created editor library to manage all things editor · c90b520d
  Phil Hughes authored Nov 17, 2017
```
[ci skip]
```
  c90b520d
- Multi-file editor dirty diff indicator · 37864fb0
  Phil Hughes authored Nov 16, 2017
```
[ci skip]
```
  37864fb0
- Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master' · 4d89f520
  Rémy Coutable authored Nov 28, 2017
```
Upgrade seed-fu to 2.3.7

Closes #40568

See merge request gitlab-org/gitlab-ce!15607
```
  4d89f520
- Merge branch 'tm/feature/namespace-by-id-api' into 'master' · 94c5ca71
  Kamil Trzciński authored Nov 28, 2017
```
Add new API endpoint - get a namespace by ID

Closes #40254

See merge request gitlab-org/gitlab-ce!15442
```
  94c5ca71
- Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into 'master' · 74b50363
  Douwe Maan authored Nov 28, 2017
```
Refactor the way we pass `old associations` to issuable's update services

Closes #40226

See merge request gitlab-org/gitlab-ce!15542
```
  74b50363
27 Nov, 2017 18 commits
- Update policies unit tests · f144cce8
  Tomasz Maczukin authored Nov 27, 2017
```
This commit also makes spec/policies/namespace_policy_spec.rb file
to be compatible with the same file in GitLab EE.
```
  f144cce8
- Add some unit tests for lib/api/helpers.rb · a9212e0f
  Tomasz Maczukin authored Nov 27, 2017
  
  a9212e0f
- Merge branch 'backport-disable-autocomplete' into 'master' · 25a3a183
  Fatih Acet authored Nov 27, 2017
```
Backport disable autocomplete

See merge request gitlab-org/gitlab-ce!15557
```
  25a3a183
- Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master' · 8e7e2aeb
  Robert Speicher authored Nov 27, 2017
```
Update prometheus gem to fix build on RPi

Closes omnibus-gitlab#2988

See merge request gitlab-org/gitlab-ce!15616
```
  8e7e2aeb
- Merge branch 'backport-epic-fullscreen' into 'master' · 04ceeac1
  Fatih Acet authored Nov 27, 2017
```
Backport epic fullscreen

See merge request gitlab-org/gitlab-ce!15437
```
  04ceeac1
- Merge branch 'backport-add-epic-sidebar' into 'master' · f8de23e6
  Fatih Acet authored Nov 27, 2017
```
Backport of add-epic-sidebar

See merge request gitlab-org/gitlab-ce!15335
```
  f8de23e6
- Update prometheus gem to fix build on RPi · 359f41fa
  Pawel Chojnacki authored Nov 27, 2017
  
  359f41fa
- Merge branch '39601-create-issuable-destroy-service' into 'master' · a7f6ab95
  Rémy Coutable authored Nov 27, 2017
```
Create issue and merge request destroy services

Closes #39601

See merge request gitlab-org/gitlab-ce!15604
```
  a7f6ab95
- Merge branch 'patch-29' into 'master' · 24fadd7c
  Rémy Coutable authored Nov 27, 2017
```
Add in the Oxford comma

See merge request gitlab-org/gitlab-ce!15602
```
  24fadd7c
- Merge branch '40273_404_on_commits_page_when_all_files_on_branch_deleted' into 'master' · 8ab0fcee
  Rémy Coutable authored Nov 27, 2017
```
Fix 404 on commits list for branch that doesn't have any files

See merge request gitlab-org/gitlab-ce!15603
```
  8ab0fcee
- Fix 404 on empty branch · d1e00b1e
  haseeb authored Nov 27, 2017
  
  d1e00b1e
- Merge branch 'optimise-stuck-ci-jobs-worker' into 'master' · 420cdc6a
  Yorick Peterse authored Nov 27, 2017
```
Optimise StuckCiJobsWorker

Closes gitlab-com/infrastructure#3260

See merge request gitlab-org/gitlab-ce!15527
```
  420cdc6a
- Fix stuck jobs tests · 6c1a4294
  Kamil Trzcinski authored Nov 27, 2017
  
  6c1a4294
- Allow to drop jobs for deleted projects · 07c7ba1b
  Kamil Trzcinski authored Nov 24, 2017
  
  07c7ba1b
- Use not-ordered search · d58bab4a
  Kamil Trzcinski authored Nov 21, 2017
  
  d58bab4a
- Optimise StuckCiJobsWorker · a26e25ea
  Kamil Trzcinski authored Nov 21, 2017
  
  a26e25ea
- Merge branch '40481-bump-jquery-to-2-2-4' into 'master' · 03b891c5
  Phil Hughes authored Nov 27, 2017
```
Upgrade jQuery to 2.2.4

Closes #40481

See merge request gitlab-org/gitlab-ce!15570
```
  03b891c5
- Merge branch 'fix_schedules_documentation' into 'master' · 5d890676
  Grzegorz Bizon authored Nov 27, 2017
```
removed 'only once' from the docs

Closes #39261

See merge request gitlab-org/gitlab-ce!15601
```
  5d890676
26 Nov, 2017 2 commits
- Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master' · 815f35be
  Stan Hu authored Nov 26, 2017
```
ignore hashed repositories when doing rake gitlab:cleanup:dirs

Closes #40352

See merge request gitlab-org/gitlab-ce!15600
```
  815f35be
- Upgrade seed-fu to 2.3.7 · c3444c9a
  Takuya Noguchi authored Nov 26, 2017
  
  c3444c9a
25 Nov, 2017 4 commits
- Create issue and merge request destroy services · 7fb1bb01
  George Andrinopoulos authored Nov 25, 2017
  
  7fb1bb01
- static-analysis fix · 30a9fc33
  digitalMoksha authored Nov 25, 2017
  
  30a9fc33
- refactored the hashed repository name · 3bb103f2
  digitalMoksha authored Nov 25, 2017
  
  3bb103f2
- Add in the Oxford comma · 73397a3e
  David Muckle authored Nov 25, 2017
  
  73397a3e
24 Nov, 2017 1 commit
- removed 'only once' from the docs · 308f2ecd
  Christiaan Van den Poel authored Nov 25, 2017
  
  308f2ecd