home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,657 Commits 48 Branches 340 Tags
306c50cecde50b0bbfc9d665a09ecd2fa1676005
Commit Graph
723 Commits
Author SHA1 Message Date
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
Jacob Vosmaer b67f8eee0d Use @repository 2016-02-02 15:06:14 +01:00
Jacob Vosmaer 51574d779c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs 2016-02-01 13:51:05 +01:00
Jacob Vosmaer b2a634c352 Avoid trailing 'charset=' garbage 2016-02-01 12:01:13 +01:00
Jacob Vosmaer 2679ec4066 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-raw-workhorse 2016-02-01 11:33:36 +01:00
Jacob Vosmaer 02afa6793c Use only one header to send git blobs 2016-02-01 11:33:22 +01:00
Jacob Vosmaer 64c8ee47c9 WIP lazy blobs 2016-02-01 10:41:52 +01:00
Dmitriy Zaporozhets 227728712e Merge branch 'note-background-job' into 'master' 
Background process note logic for #3948

Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist.

```
without background processing
  Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms)
  Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms)
  Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms)

with background processing
  Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms)
  Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms)
  Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms)
```

As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount.

@dzaporozhets @yorickpeterse I would love some input on this.

See merge request !2631
 2016-01-29 13:51:34 +00:00
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' 
Correctly determine MR diff base when MR has merge conflicts

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779

See merge request !2632
 2016-01-28 21:08:41 +00:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Josh Frye f9218898ec [WIP] Background process note logic for #3948 2016-01-28 13:04:42 -05:00
Jacob Vosmaer 368b855d88 No need for base64 anymore 2016-01-28 18:08:37 +01:00
Jacob Vosmaer 26d97ac5e1 Send more raw blob data with workhorse 2016-01-28 18:04:46 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Douwe Maan 5cce1278ad Correctly determine MR diff base when MR has merge conflicts 2016-01-27 17:23:59 +01:00
Douwe Maan 4be80f8aa3 Fix highlighting in blame view. 2016-01-27 16:15:24 +01:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Douwe Maan 150b4f66e6 Make sure non-highlighted diffs are still escaped 2016-01-22 01:47:17 +01:00
Douwe Maan 577f2fb47a Save and use actual diff base commit for MR diff highlighting 2016-01-20 18:44:27 +01:00
Douwe Maan c23ca0b0b5 Merge branch 'master' into issue_3945 2016-01-20 14:53:41 +01:00
Rubén Dávila 91bd0bf99e Some CSS and sorting fixes. 2016-01-20 00:17:21 -05:00
Rubén Dávila 40e1ad9052 Add ability to sort forks. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila b2e5b57fab Add fork button and implement ability to distinguish between public and protected forks. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 2b05bf4be5 Use Project creator's avatar in fork listing. #2406 2016-01-20 00:14:58 -05:00
Rubén Dávila 7765ce1875 Setup new fork link in sidebar and routes. #2406 2016-01-20 00:14:58 -05:00
Rémy Coutable 491c2248c0 Fix diff comments loaded by AJAX to load comment with diff in discussion tab 
This commits also fixes two minor issues:
- Ensure notes that the current user is not allowed to see are not
  returned in the AJAX notes loading
- Ensure the notes counter badge is decremented of 1 instead of 2
 2016-01-19 18:22:01 +01:00
Robert Speicher 8a028cf3a2 Merge branch 'fix-autocomplete-new-issues' into 'master' 
Fix autocomplete for new issues/MRs/snippets

Fixes gitlab-org/gitlab-ce#8067

See merge request !2446
 2016-01-15 20:57:56 +00:00
Jacob Vosmaer 67a6fee5b1 Prototype of Git blobs via workhorse 2016-01-15 18:12:36 +01:00
Grzegorz Bizon 6b2f38f39a Fix nonexistent method in artifacts controller 2016-01-15 13:48:29 +01:00
Andrew JohnsonandGrzegorz Bizon f66f9e95bf Give reporters the ability to download artifacts. 
Also fix a few places where page_404 should be render_404.
 2016-01-15 12:01:19 +01:00
Yorick Peterse f7240e03a6 Fix autocomplete for new issues/MRs/snippets 2016-01-15 11:29:53 +01:00
Rubén Dávila c8db25c37c Merge branch 'master' into issue_3945 2016-01-14 17:28:44 -05:00
Rubén Dávila 6b9c730e91 More refactoring from last code review. #3945 
* Use commit objects instead of IDs when generating diffs
* Use proper references when generating MR's source and target
* Update broken specs
 2016-01-14 16:47:55 -05:00
Rubén Dávila 70bc322415 Use the adequate reference for the old rev. #3945 2016-01-14 16:41:10 -05:00
Douwe Maan 8dfad143d4 Add inline diff markers in highlighted diffs. 2016-01-14 22:28:07 +01:00
Grzegorz Bizon 6b0a43aff3 Improve readability of artifacts browser Entry related code 2016-01-14 12:48:17 +01:00
Grzegorz Bizon 487b0a026f Improvements, readability for artifacts browser 2016-01-14 12:48:16 +01:00
Grzegorz Bizon e9c2628220 Check if file exists in metadata in download action 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 09a4a5aff8 Render only valid paths in artifacts metadata 
In this version we will support only relative paths in artifacts
metadata. Support for absolute paths will be introduced later.
 2016-01-14 12:48:16 +01:00
Grzegorz Bizon 61fb47a432 Simplify implementation of build artifacts browser (refactoring) 2016-01-14 12:48:15 +01:00
Grzegorz Bizon cd3b8bbd2f Add method that checks if path exists in StringPath 2016-01-14 12:48:15 +01:00
Grzegorz Bizon a5e1905d28 Render 404 when artifacts path is invalid 2016-01-14 12:48:15 +01:00
Grzegorz Bizon a7f99b67a0 Extract artifacts metadata implementation to separate class 2016-01-14 12:48:15 +01:00
Grzegorz Bizon 3de8a4620a Parse artifacts metadata stored in JSON format 2016-01-14 12:48:15 +01:00
Grzegorz Bizon 447f56036e Use metadata stored in artifacats metadata file 2016-01-14 12:48:14 +01:00
Grzegorz Bizon 662f4b9e1d Add artifacts metadata uploader filed 
Artifacts metadata field will be used to store a filename of gzipped
file containing metadata definition for given artifacts archive.
 2016-01-14 12:48:14 +01:00
Grzegorz Bizon 8eeed761a9 Update specs for CI Build, add artifacts? method 
`artifacts?` method checks if artifacts archive is available.
 2016-01-14 12:48:14 +01:00
Grzegorz Bizon ebd69c5fc1 Remove artifacts metadata column from database 2016-01-14 12:48:13 +01:00