Commit Graph

64883 Commits

Author SHA1 Message Date
Phil Hughes 061be86e05
added specs 2017-11-28 14:43:47 +00:00
Phil Hughes fd818194f1
fixed web worker performance
[ci skip]
2017-11-28 09:23:42 +00:00
Phil Hughes 3a1c3c5df5
added web worker to calculate diffs
[ci skip]
2017-11-28 09:23:42 +00:00
Phil Hughes 809a27e61e
started move to web worker for diff calculation 2017-11-28 09:23:42 +00:00
Phil Hughes 7c04e4086c
changed endLineNumber calculation
[ci skip]
2017-11-28 09:23:41 +00:00
Phil Hughes caa2f10e71
change how diffing works
[ci skip]
2017-11-28 09:23:41 +00:00
Phil Hughes eb8a609519
added disposable manager
added model manager

[ci skip]
2017-11-28 09:23:41 +00:00
Phil Hughes c90b520d79
created editor library to manage all things editor
[ci skip]
2017-11-28 09:23:40 +00:00
Phil Hughes 37864fb0da
Multi-file editor dirty diff indicator
[ci skip]
2017-11-28 09:23:39 +00:00
Rémy Coutable 4d89f5207c Merge branch '40568-bump-seed-fu-to-2-3-7' into 'master'
Upgrade seed-fu to 2.3.7

Closes #40568

See merge request gitlab-org/gitlab-ce!15607
2017-11-28 09:22:53 +00:00
Kamil Trzciński 94c5ca71b7 Merge branch 'tm/feature/namespace-by-id-api' into 'master'
Add new API endpoint - get a namespace by ID

Closes #40254

See merge request gitlab-org/gitlab-ce!15442
2017-11-28 08:57:39 +00:00
Douwe Maan 74b5036394 Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into 'master'
Refactor the way we pass `old associations` to issuable's update services

Closes #40226

See merge request gitlab-org/gitlab-ce!15542
2017-11-28 08:25:18 +00:00
Tomasz Maczukin f144cce8ef
Update policies unit tests
This commit also makes spec/policies/namespace_policy_spec.rb file
to be compatible with the same file in GitLab EE.
2017-11-27 23:06:43 +01:00
Tomasz Maczukin a9212e0f07
Add some unit tests for lib/api/helpers.rb 2017-11-27 23:06:42 +01:00
Fatih Acet 25a3a1838a Merge branch 'backport-disable-autocomplete' into 'master'
Backport disable autocomplete

See merge request gitlab-org/gitlab-ce!15557
2017-11-27 21:40:31 +00:00
Robert Speicher 8e7e2aeb4f Merge branch 'pawel/update_prometheus_gem_to_fix_build_on_Rpi' into 'master'
Update prometheus gem to fix build on RPi

Closes omnibus-gitlab#2988

See merge request gitlab-org/gitlab-ce!15616
2017-11-27 20:39:18 +00:00
Fatih Acet 04ceeac1f6 Merge branch 'backport-epic-fullscreen' into 'master'
Backport epic fullscreen

See merge request gitlab-org/gitlab-ce!15437
2017-11-27 20:35:18 +00:00
Fatih Acet f8de23e626 Merge branch 'backport-add-epic-sidebar' into 'master'
Backport of add-epic-sidebar

See merge request gitlab-org/gitlab-ce!15335
2017-11-27 20:21:53 +00:00
Pawel Chojnacki 359f41fad1 Update prometheus gem to fix build on RPi 2017-11-27 17:52:30 +01:00
Rémy Coutable a7f6ab952a Merge branch '39601-create-issuable-destroy-service' into 'master'
Create issue and merge request destroy services

Closes #39601

See merge request gitlab-org/gitlab-ce!15604
2017-11-27 16:16:20 +00:00
Rémy Coutable 24fadd7c3d Merge branch 'patch-29' into 'master'
Add in the Oxford comma

See merge request gitlab-org/gitlab-ce!15602
2017-11-27 14:47:56 +00:00
Rémy Coutable 8ab0fceeef Merge branch '40273_404_on_commits_page_when_all_files_on_branch_deleted' into 'master'
Fix 404 on commits list for branch that doesn't have any files

See merge request gitlab-org/gitlab-ce!15603
2017-11-27 13:36:03 +00:00
haseeb d1e00b1eb6 Fix 404 on empty branch 2017-11-27 13:36:02 +00:00
Yorick Peterse 420cdc6a52 Merge branch 'optimise-stuck-ci-jobs-worker' into 'master'
Optimise StuckCiJobsWorker

Closes gitlab-com/infrastructure#3260

See merge request gitlab-org/gitlab-ce!15527
2017-11-27 12:21:26 +00:00
Kamil Trzcinski 6c1a429420 Fix stuck jobs tests 2017-11-27 11:56:15 +01:00
Kamil Trzcinski 07c7ba1bf4 Allow to drop jobs for deleted projects 2017-11-27 11:56:15 +01:00
Kamil Trzcinski d58bab4aa5 Use not-ordered search 2017-11-27 11:56:15 +01:00
Kamil Trzcinski a26e25ea75 Optimise StuckCiJobsWorker 2017-11-27 11:56:15 +01:00
Phil Hughes 03b891c579 Merge branch '40481-bump-jquery-to-2-2-4' into 'master'
Upgrade jQuery to 2.2.4

Closes #40481

See merge request gitlab-org/gitlab-ce!15570
2017-11-27 09:07:14 +00:00
Grzegorz Bizon 5d89067660 Merge branch 'fix_schedules_documentation' into 'master'
removed 'only once' from the docs

Closes #39261

See merge request gitlab-org/gitlab-ce!15601
2017-11-27 08:55:08 +00:00
Stan Hu 815f35be4f Merge branch '40352-ignore-hashed-repos-cleanup-dirs' into 'master'
ignore hashed repositories when doing rake gitlab:cleanup:dirs

Closes #40352

See merge request gitlab-org/gitlab-ce!15600
2017-11-26 13:41:17 +00:00
Takuya Noguchi c3444c9a20 Upgrade seed-fu to 2.3.7 2017-11-26 18:49:59 +09:00
George Andrinopoulos 7fb1bb01bd Create issue and merge request destroy services 2017-11-25 22:09:18 +02:00
digitalMoksha 30a9fc33f3 static-analysis fix 2017-11-25 15:20:24 +01:00
digitalMoksha 3bb103f282 refactored the hashed repository name 2017-11-25 14:23:41 +01:00
David Muckle 73397a3e6c Add in the Oxford comma 2017-11-25 02:18:27 +00:00
Christiaan Van den Poel 308f2ecd1d removed 'only once' from the docs 2017-11-25 00:03:48 +01:00
Tim Zallmann d199ecd452 Merge branch 'fl-upgrade-svg' into 'master'
Update svg external dependency

See merge request gitlab-org/gitlab-ce!15596
2017-11-24 21:28:45 +00:00
digitalMoksha 02dd3b4ed1 static analysis fix 2017-11-24 21:10:00 +01:00
Marcia Ramos 25b35630a7 Merge branch 'docs/runner-aws-spot-instances' into 'master'
Add article on autoscaling GitLab Runner on AWS

Closes #39650

See merge request gitlab-org/gitlab-ce!15313
2017-11-24 20:02:01 +00:00
digitalMoksha 9fddca65e3 added changelog 2017-11-24 19:35:17 +01:00
Stan Hu 3c71af9fdf Merge branch 'pawel/update_prometheus_gem_to_fix_compilation_on_centos' into 'master'
Update prometheus Gem to fix compilation on centos 6 due to GCC not recognizing `std=c11` option

Closes omnibus-gitlab#2988

See merge request gitlab-org/gitlab-ce!15598
2017-11-24 18:33:46 +00:00
digitalMoksha 17069a9547 ignore hashed repositories when doing rake gitlab:cleanup:dirs 2017-11-24 19:29:25 +01:00
Pawel Chojnacki d261e274bf Update prometheus Gem to fix compilation on centos 6 duo to GCC not recognizing `std=c11` option 2017-11-24 18:36:45 +01:00
Rémy Coutable b355ebc4c9 Merge branch 'jej/fix-protected-branch-validations-ce' into 'master'
Fix ProtectedBranch access level validations

See merge request gitlab-org/gitlab-ce!15586
2017-11-24 16:16:31 +00:00
Sean McGivern 7230a34453 Merge branch 'dm-project-search-performance' into 'master'
Drastically improve project search performance by no longer searching namespace name

Closes #40510 and #39623

See merge request gitlab-org/gitlab-ce!15590
2017-11-24 16:10:53 +00:00
Rémy Coutable 882dac685c Merge branch 'qa/gb/add-feedback-to-package-qa-action' into 'master'
Add a feedback mechanism to `package-qa` manual action

Closes #40431

See merge request gitlab-org/gitlab-ce!15538
2017-11-24 15:54:36 +00:00
Grzegorz Bizon 2998b88603 Add a feedback mechanism to `package-qa` manual action 2017-11-24 15:54:35 +00:00
Filipa Lacerda 2089b5802f
Update svg external dependency 2017-11-24 15:42:39 +00:00
Douwe Maan 8041a87288 Drastically improve project search performance by no longer searching namespace name 2017-11-24 15:57:17 +01:00