Commit Graph
763 Commits
Author SHA1 Message Date
Valery Sizov 61e5f27f27 fix specs 2015-12-04 12:21:02 +02:00
Valery Sizov 7b327b68e3 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-12-01 19:54:45 +02:00
Valery Sizov 40ff1318d2 Rails update to 4.2.4 2015-11-25 18:18:44 +02:00
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Dmitriy Zaporozhets 1f4dc0b14c Merge branch '8-2-stable' of gitlab.com:gitlab-org/gitlab-ce into 8-2-stable-ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-20 14:05:09 +01:00
Yorick Peterse 1cdee35f60 Merge branch 'atom-feed-latest-update' into 'master'
Improve performance of user profiles, finding groups, and finding projects

This MR improves the following:

* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)

Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.

See merge request !1790
2015-11-20 11:02:27 +01:00
Dmitriy ZaporozhetsandRobert Speicher 48e86ec610 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 19:50:58 -05:00
Dmitriy Zaporozhets 68d4ab2381 Merge branch 'emoji_votes' into 'master'
Award Emoji

This it first iteration of award emoji feature.
We have plan to extend emoji picker by the next release.

For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 21:34:38 +00:00
Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee
Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
2015-11-19 10:33:18 -05:00
Yorick Peterse e4ae8b1385 Updated DB schema with new issues/projects indexes 2015-11-19 11:48:50 +01:00
Yorick Peterse d63da89094 Added index on projects.visibility_level 2015-11-19 11:46:38 +01:00
Yorick Peterse 50f6541610 Added index on issues.state
This field is queried when filtering issues and due to the lack of an
index would end up triggering a sequence scan.
2015-11-19 11:46:38 +01:00
Yorick Peterse a42d469ab2 Merge branch 'atom-feed-latest-update' into 'master'
Improve performance of user profiles, finding groups, and finding projects

This MR improves the following:

* Rendering of profile pages and Atom feeds
* Finding groups (using GroupsFinder & friends)
* Finding projects (using ProjectsFinder & friends)

Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems.

See merge request !1790
2015-11-19 10:05:53 +00:00
Valery Sizov a2912074be satisfy rubocop 2015-11-19 01:31:15 +02:00
Valery Sizov fa2ed94fe9 fix schema 2015-11-19 01:26:00 +02:00
Valery Sizov fdd5a8f2e1 addressing comments 2015-11-19 01:26:00 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Douwe MaanandRobert Speicher 834e440f70 Merge branch 'mirror-repository' into 'master'
Add option to mirror an upstream repository.

Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/279

Depends on gitlab-org/gitlab-shell!29

To do:

- [x] Decide on what user should be the author of the activity feed events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.
- [x] Write specs!
- [x] Write documentation
- [x] Port back relevant commits to CE: gitlab-org/gitlab-ce!1822

----

## Mirror status on project homepage

![Screen_Shot_2015-11-12_at_12.48.15](/uploads/39666b0e4a14723407b0f66e2aaddb46/Screen_Shot_2015-11-12_at_12.48.15.png)


## Settings navigation item

![Screen_Shot_2015-11-10_at_17.32.27](/uploads/116ece85f65681bbd3c7c5e282ab3b3c/Screen_Shot_2015-11-10_at_17.32.27.png)

## Mirroring settings

![Screen_Shot_2015-11-17_at_11.17.17](/uploads/ff57c89831524435ec6a063c3c470203/Screen_Shot_2015-11-17_at_11.17.17.png)


## Activity feed with new "pushes" (mirror updates)
![activity_feed](/uploads/04754251f2142fd06b1fddc2aae45232/activity_feed.png)

I have yet to decide on what user should be the author of these events. The initial project creator perhaps? That makes sense for personal projects, but less so for group projects, where it's even possible that the creator has since left the team.

## Warning that branch has diverged from upstream
![diverged](/uploads/ecf7ae6c5709f626c750695f45ca521a/diverged.png)

## Commits heading after failed update
![commits_failure](/uploads/d1b3e1f6796431c839ee9e2f67499283/commits_failure.png)

Link send user to the mirroring settings if they are a project admin.

## Mirroring settings after failed update

![Screen_Shot_2015-11-12_at_12.43.09](/uploads/ece68d5021c9a4c374bf6d973cf9fafa/Screen_Shot_2015-11-12_at_12.43.09.png)

## New project page
![new_project](/uploads/296beb6c7faf390a9b7e1facc9c1d4d6/new_project.png)

## Import form after failed import
(Screenshot outdated)

![new_import_failure](/uploads/ac0ebfc8ec23232603126fe0a6e10171/new_import_failure.png)

Shown when the initial import of a project fails, not when an update of an existing project fails.

cc @dzaporozhets @sytses @JobV

See merge request !51
2015-11-18 16:50:49 -05:00
Douwe MaanandRobert Speicher 371e8505f8 Merge branch 'ce-mirror-backport' into 'master'
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
2015-11-18 16:41:56 -05:00
Yorick Peterse ee2739e606 Added an index on namespaces.public 2015-11-18 17:24:51 +01:00
Douwe Maan 531177757e Add import_error to project. 2015-11-18 12:00:48 +01:00
Valery Sizov c67bafca31 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 17:05:47 +02:00
Marin Jankovski 84c71e5d82 Add unique to oid index for lfs object. 2015-11-16 15:59:15 +01:00
Marin Jankovski f445d3d1f3 unique is for indexes. 2015-11-16 15:36:14 +01:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Robert Speicher 6afca45028 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-13 12:34:34 -05:00
Kamil Trzcinski d0e3e823a2 Implement Build Artifacts
- Offloads uploading to GitLab Workhorse
- Use /authorize request for fast uploading
- Added backup recipes for artifacts
- Support download acceleration using X-Sendfile
2015-11-10 12:51:50 +01:00
Dmitriy Zaporozhets 354b69dde2 Merge remote-tracking branch 'origin/release-notes'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-10 10:20:22 +01:00
Kamil Trzciński 9f05512647 Merge branch 'shared_runners' into 'master'
Enable shared runners for all new projects

This adds Admin Setting option to enable shared runners for all new projects, and by default it is set to true.

/cc @dzaporozhets @sytses 


See merge request !1738
2015-11-09 09:41:07 +00:00
Kamil Trzcinski b18671a1b2 Enable shared runners for all new projects 2015-11-05 17:02:02 +01:00
Valery Sizov aecc4376e2 make migrations reversible 2015-11-05 16:47:25 +02:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
Valery Sizov 6051c28fc0 Allow groups to appear in the search results if the group owner allows it 2015-11-05 13:18:51 +02:00
Dmitriy Zaporozhets 1c4d1c3bd6 Add release model
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-05 11:03:02 +01:00
Alex Lossent f4501143d2 Allow configuring the Jira API URL
A DB migration takes care of initializing the API URL using the same logic as before.
Remove the api_version property which now seems redundant.
2015-10-30 14:34:39 +01:00
Yorick Peterse 7fc95d805d Added index on services.template
This column is queried when creating a new project, without an index
this query would lead to a sequence scan.
2015-10-29 12:09:25 +01:00
Kamil Trzcinski 01c7769c75 Add projects path index
Fixes performance regression introduced by MR1649
2015-10-26 20:21:26 +01:00
Jacob Vosmaer 122f02bc39 Remove the contents of the satellites dir 2015-10-23 17:39:22 +02:00
Kamil Trzcinski 0b25d837b8 Fail builds that also have empty string 2015-10-23 13:33:44 +02:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Stan Hu e39fdc1ddd Ensure MySQL CI limits DB migrations occur after the fields have been created
Closes https://github.com/gitlabhq/gitlabhq/issues/9753
2015-10-21 00:11:06 -07:00
Kamil Trzcinski f9f6724f55 Added extra index for faster enumeration of CI builds 2015-10-20 19:41:45 +02:00
Kamil Trzcinski 8f4ae40e3c Add missing migrations 2015-10-20 19:24:41 +02:00
Robert Speicher ba41b2ba43 Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'master'
Send an email to admin email when a user is reported for spam

Replaces !1547.

Fixes #2839.

See merge request !1634
2015-10-19 12:06:13 +00:00
Douwe Maan aafb36616c Fix schema
[ci skip]
2015-10-18 14:26:25 +02:00
Douwe Maan a62bd12117 Merge branch 'master' into zj/gitlab-ce-index-milestone-title-label 2015-10-18 13:12:10 +02:00
Douwe Maan df9062d0b5 Merge branch 'master' into jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify 2015-10-18 11:31:49 +02:00
Yorick Peterse f405954764 Added indexes for notes.line_code and CI columns
This adds indexes for the following columns:

* notes.line_code
* ci_projects.gitlab_id
* ci_projects.shared_runners_enabled
* ci_builds.type
* ci_builds.status
2015-10-16 21:58:30 +02:00
Yorick Peterse c6be5006da Add index on ci_commits.gl_project_id
Fixes #3086
2015-10-16 15:29:50 +02:00
Zeger-Jan van de Weg 9127ae5ca8 Improve performance of queries
Credits to Douwe Maan
2015-10-16 11:30:26 +02:00