Commit Graph
743 Commits
Author SHA1 Message Date
Douwe Maan 879d66b6ab Merge branch 'git-archive-refactor' into 'master'
Refactor 'git archive' hand-off to gitlab-workhorse

We have a nicer way now to hand off HTTP responses to gitlab-workhorse.

Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36

See merge request !2675
2016-02-17 17:16:34 +00:00
Rémy Coutable 3d3ac87af9 Redirect /import to project page if no importing at all and repo exists
Fixes #13367.
2016-02-17 15:05:44 +01:00
Jacob Vosmaer a0ccb0731b Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor 2016-02-17 11:30:42 +01:00
Robert Speicher f5ab126fd0 Ensure Commit#show responds 404 instead of 500 when given an invalid ID
Closes #13467
2016-02-15 15:48:16 -05:00
Douwe Maan 9022070fac Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master'
Fix milestone order in project and issue edit lists to due_date

_Originally opened at !2579 by @olirogers._

- - -

This MR orders the milestones by due date (earliest first) in the project and edit issue view. These suggestions were made be @orih in #6001 and fixes #6001.

This continues the work of !1934 to order milestones.

I found this annoying when creating milestones, found #6001 but no attached MR. This is my first for this project - comments and criticisms welcome.

See merge request !2780
2016-02-12 09:32:57 +00:00
Grzegorz Bizon 28b11963b1 Move builds badge implementation to new badges controller 2016-02-11 10:29:15 +01:00
Grzegorz Bizon d51e8e1b77 Inherit build badge access permissions from project 2016-02-11 10:29:15 +01:00
Grzegorz Bizon 479d412e09 Respond to proper format for build badge request 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 52352dccc3 Move badge implementation to builds controller 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 442a49db2b Skip authentication when requesting commit status badge 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 28c4c949a5 Improve CI status badge implementation 2016-02-11 10:29:14 +01:00
Grzegorz Bizon 14f928b730 Add CI status badge implementation to commit controller 2016-02-11 10:29:14 +01:00
Oliver RogersandRémy Coutable a7567ca152 Fix milestone order in project and issue edit lists to due_date 2016-02-10 17:42:20 +01:00
Douglas Barbosa Alexandre 1353cff5fe Replaces "Create merge request" link with one to the MR when one exists 2016-02-10 10:32:25 -02:00
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Rémy Coutable f6d816f9fe Add a controller test for the new 'diff_view' cookie 2016-02-05 15:40:44 +01:00
kkmandRémy Coutable cf1349adb7 Remember user's inline/tabular diff view preference in a cookie 2016-02-05 15:40:44 +01:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions
# Conflicts:
#	app/views/projects/builds/index.html.haml
2016-02-04 13:16:48 +01:00
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 771f14b96e First version of "git archive" headers 2016-02-02 14:09:55 +01:00
Kamil Trzcinski 055afab5c7 Make the CI permission model simpler
This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
2016-02-02 09:18:08 +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