Commit Graph
3361 Commits
Author SHA1 Message Date
Valery Sizov 18c7336892 Merge remote-tracking branch 'origin/master' into ce_upstream 2015-11-24 18:06:46 +02:00
Valery Sizov 3eb15786e9 Merge remote-tracking branch 'ee_com/8-2-stable-ee' into ce_upstream 2015-11-24 15:00:14 +02:00
Robert Speicher 31a34b5917 Merge branch 'ci-artifacts-path' into 'master'
Expose artifacts path

This fixes broken artifacts storage path.

Fixes #3607 
Fixes #3608

Related: gitlab-org/omnibus-gitlab!544

See merge request !1869
2015-11-23 22:19:13 +00:00
Dmitriy Zaporozhets f84fb81970 Merge branch 'required_version_and_docs_update' into 'master'
Update required version of lfs client and separate the docs for users and admins.



See merge request !1855
2015-11-23 14:47:35 +00:00
Kamil Trzcinski 11728b50f9 Expose artifacts path 2015-11-23 13:05:22 +01:00
Robert Speicher 698455466a Merge remote-tracking branch 'ce/8-2-stable' into 8-2-stable-ee 2015-11-21 23:13:20 -05:00
Robert SpeicherandRobert Speicher 94b33caf84 Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-21 22:46:18 -05:00
Robert Speicher b166ee6b1d Merge branch 'fix-award-emoji-api' into 'master'
Add upvote/downvote fields to merge request and note API to preserve compatibility

As discussed in !1825 we should not break the API compatibility.

* This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
* Add the fields `upvote`/`downvote` to the notes API, which always return `false`

This behavior is documented in the API docs.

See merge request !1867
2015-11-22 03:45:15 +00:00
Stan HuandRobert Speicher 27821ce01f Merge branch 'consistent-tags-api' into 'master'
Make tag API for release feature consistent

Make tags API consistent with other tags methods. This changes the endpoint from `PUT /projects/:id/repository/:tag/release` to `PUT /projects/:id/repository/tags/:tag_name/release`.

On thing the API is still missing, is an error if the tag does not exist. Right now it returns 200 even the tag does not exist. I'll fix that such it returns 404.

@stanhu Can you review?
@rspeicher This MR should go into 8.2

See merge request !1864
2015-11-21 22:38:13 -05:00
Robert Schilling 04a3d27eab Allow editing a release in API via PUT method 2015-11-21 22:34:53 +01:00
Robert Schilling 3ea05c5b5b Only allow to create a release if it does not exist yet 2015-11-21 22:24:34 +01:00
Robert Schilling 26b12e2c37 Add upvote/downvote fields to merge request and note API to preserve compatibility 2015-11-21 21:36:31 +01:00
Robert Schilling 6f7e90f6db Use POST to create a new release instead of PUT 2015-11-21 18:51:41 +01:00
Robert Schilling faef95af1a API: Return 404 if the tag for a release does not exist 2015-11-21 18:08:45 +01:00
Robert Schilling 2cba93a0d2 Make tag API consistent for release feature 2015-11-21 17:29:26 +01:00
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01: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
Dmitriy Zaporozhets b6f0eddce5 Merge branch 'lfs-batch-download-to-stable' into '8-2-stable'
Lfs batch download to stable

!1842 for stable

See merge request !1853
2015-11-20 12:59:53 +00:00
Marin Jankovski 807c1a993d Merge branch 'lfs-batch-download' into 'master'
Add support for batch download operation

- Drops Accept for all download requests,
- Allows to do batch download for public projects and non-authorized users
- Returns 501 for legacy API with message to upgrade the client

/cc @marin @jacobvosmaer @yorickpeterse 

See merge request !1842
2015-11-20 12:19:20 +00:00
Dmitriy Zaporozhets ea27943291 Merge branch 'lfs_on_by_default_and_backup' into '8-2-stable'
Lfs on by default and backup



See merge request !1852
2015-11-20 12:04:12 +00:00
Marin Jankovski 89dec03c73 Error 501 when client is using deprecated API. 2015-11-20 12:50:47 +01:00
Kamil TrzcinskiandMarin Jankovski 760dc3e42c Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:50:45 +01:00
Kamil TrzcinskiandMarin Jankovski 7ea48bfb25 Part of tests done [ci skip] 2015-11-20 12:50:42 +01:00
Kamil TrzcinskiandMarin Jankovski 2811347884 Add support for batch download operation 2015-11-20 12:49:07 +01:00
Marin Jankovski dbc0be1b27 Error 501 when client is using deprecated API. 2015-11-20 12:45:30 +01:00
Kamil Trzcinski b8d8292bef Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:21:41 +01:00
Kamil Trzcinski 14d95b0529 Part of tests done [ci skip] 2015-11-20 11:59:32 +01:00
Marin Jankovski a2001eecc7 Backup LFS objects same as any upload. 2015-11-20 11:39:53 +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 Zaporozhets b96fa3094a Merge branch 'lfs_default_and_backup' into 'master'
Lfs default and backup

Part of gitlab-org/gitlab-ce#2955

See merge request !1823
2015-11-20 09:10:27 +00: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
Kamil Trzcinski 888821f9ff Add support for batch download operation 2015-11-19 19:28:14 +01: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
Dmitriy ZaporozhetsandRobert Speicher 61c6e96971 Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'
Check which folders and archives should be packed before passing to tar command.

If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: `Cannot stat: No such file or directory`.

This MR fixes that by checking for skipped items.
Additionally, compact everything to avoid `TypeError: no implicit conversion of nil into String` errors.

See merge request !1824
2015-11-19 09:50:07 -05:00
Dmitriy ZaporozhetsandRobert Speicher 71cb328b4a Merge branch 'update_nginx_deploy' into 'master'
Deploy page should be shown for all pages not just root

Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540

This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening.

See merge request !1828
2015-11-19 09:44:12 -05:00
Robert SpeicherandRobert Speicher 2dd4314fae Merge branch 'client-max-body-size' into 'master'
Do not limit workhorse POST/PUT size in NGINX

Limiting, if any, should happen in gitlab-workhorse.

See merge request !1831
2015-11-19 09:42:17 -05:00
Robert Speicher c8074b6b11 Merge branch 'client-max-body-size' into 'master'
Do not limit workhorse POST/PUT size in NGINX

Limiting, if any, should happen in gitlab-workhorse.

See merge request !1831
2015-11-19 14:41:44 +00:00
Jacob Vosmaer 372dcc217e Do not limit workhorse POST/PUT size in NGINX
Limiting, if any, should happen in gitlab-workhorse.
2015-11-19 13:51:18 +01:00
Dmitriy Zaporozhets b7029841cf Merge branch 'update_nginx_deploy' into 'master'
Deploy page should be shown for all pages not just root

Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540

This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening.

See merge request !1828
2015-11-19 12:29:47 +00: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
Dmitriy Zaporozhets 5b30285407 Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'
Check which folders and archives should be packed before passing to tar command.

If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: `Cannot stat: No such file or directory`.

This MR fixes that by checking for skipped items.
Additionally, compact everything to avoid `TypeError: no implicit conversion of nil into String` errors.

See merge request !1824
2015-11-19 10:00:58 +00:00
Marin Jankovski 3cc2b48a82 Backup LFS objects same as any upload. 2015-11-19 10:43:45 +01:00
Dmitriy Zaporozhets 2c7563c97d Merge branch 'fix-flog' into 'master'
Refactor complex methods to make CI green



See merge request !57
2015-11-19 08:49:39 +00:00
Valery Sizov a2912074be satisfy rubocop 2015-11-19 01:31:15 +02:00
Valery Sizov 23df515fd0 Emoji: fix image of emoji when it is submitted via comment 2015-11-19 01:26:00 +02:00
Valery SizovandValery Sizov 2d1fcd802a Emoji: refactoring 2015-11-19 01:25:59 +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