GitLab merge requestshttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests2015-11-06T12:45:21Zhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/47Allow groups to appear in the `Share with group` share if the group owner all...2015-11-06T12:45:21ZValery SizovAllow groups to appear in the `Share with group` share if the group owner allows ithttps://dev.gitlab.org/gitlab/gitlabhq/issues/2565https://dev.gitlab.org/gitlab/gitlabhq/issues/25658.2Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/48CE upsteram2016-11-07T19:29:15ZValery SizovCE upsteram8.2username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/49Update changelog2015-11-05T16:11:09ZValery SizovUpdate changelog8.2Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/50Fix JIRA integration issue closing2015-11-10T17:08:57ZDrew BlessingFix JIRA integration issue closingThis is related to !45 and fixes #67
This represents a minimal fix from !45 necessary to get 8.1 working with JIRA integration. This is related to !45 and fixes #67
This represents a minimal fix from !45 necessary to get 8.1 working with JIRA integration. Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/51Add option to mirror an upstream repository.2018-12-14T00:58:00ZDouwe MaanAdd 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 make...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 @JobV8.2Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/52It is confusing to have two administrator documentation sections.2016-11-07T19:29:15ZSid SijbrandijIt is confusing to have two administrator documentation sections.username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/54CE-to-EE master2016-11-07T19:29:15ZRobert SpeicherCE-to-EE master8.2Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/55Add 8.2 CE-to-EE update guide2016-11-07T19:29:15ZRobert SpeicherAdd 8.2 CE-to-EE update guide[ci skip][ci skip]8.2Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/56Added documentation on how to downgrade from EE to CE2016-11-07T19:29:16ZPatricio CanoAdded documentation on how to downgrade from EE to CE/cc @dblessing /cc @dblessing Achilleas PipinellisAchilleas Pipinellishttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/57Refactor complex methods to make CI green2016-11-07T19:29:16Zusername-removed-444Refactor complex methods to make CI green8.3username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/58Reduce method complexity in AutocompleteController2019-02-07T20:53:47ZDouwe MaanReduce method complexity in AutocompleteControllerhttps://staging.gitlab.com/gitlab-org/gitlab-ce/issues/23https://staging.gitlab.com/gitlab-org/gitlab-ce/issues/23username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/59Merge 8-2-stable into 8-2-stable-ee2016-11-07T19:29:17ZRobert SpeicherMerge 8-2-stable into 8-2-stable-ee8.2Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/608 2 stable ce to ee2016-11-07T19:29:18Zusername-removed-4448 2 stable ce to ee8.2username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/61Discourage users from clicking 'Clear LDAP permission cache'.2016-09-15T15:36:25ZRubén DávilaDiscourage users from clicking 'Clear LDAP permission cache'.Reference: https://dev.gitlab.org/gitlab/gitlab-ee/issues/280Reference: https://dev.gitlab.org/gitlab/gitlab-ee/issues/2808.3username-removed-444username-removed-444https://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/62Use the 'shared' directory for MR rebasing2016-11-07T19:29:19Zusername-removed-5302Use the 'shared' directory for MR rebasing8.2Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/63Allow license to be uploaded as text rather than file2016-11-07T19:29:19ZDouwe MaanAllow license to be uploaded as text rather than fileRE gitlab-com/www-gitlab-com#423
![Screen_Shot_2015-11-24_at_15.52.46](/uploads/ff1f2a40047c8770d169cad25f806f6b/Screen_Shot_2015-11-24_at_15.52.46.png)
![Screen_Shot_2015-11-24_at_16.12.13](/uploads/a1d3344c534b235c6ff1c248ba6dd89...RE gitlab-com/www-gitlab-com#423
![Screen_Shot_2015-11-24_at_15.52.46](/uploads/ff1f2a40047c8770d169cad25f806f6b/Screen_Shot_2015-11-24_at_15.52.46.png)
![Screen_Shot_2015-11-24_at_16.12.13](/uploads/a1d3344c534b235c6ff1c248ba6dd895/Screen_Shot_2015-11-24_at_16.12.13.png)
Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/64CE upstream2016-11-07T19:29:19ZValery SizovCE upstream8.3Valery SizovValery Sizovhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/65License information can now be retrieved via the API2016-11-07T19:29:19ZPatricio CanoLicense information can now be retrieved via the APIFixes #54
@DouweM if you have time to review as well, that would be great.Fixes #54
@DouweM if you have time to review as well, that would be great.8.3Douwe MaanDouwe Maanhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/66Mention repository mirroring for new projects in docs.2016-11-07T19:29:19ZDouwe MaanMention repository mirroring for new projects in docs.Robert SpeicherRobert Speicherhttps://staging.gitlab.com/gitlab-org/gitlab/-/merge_requests/67CE upstream2016-11-07T19:29:20ZValery SizovCE upstream@dzaporozhets Please resolve these conflicts
```
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/views/groups/group_members/index.html.haml
both modified: app/views/projects/project_members/...@dzaporozhets Please resolve these conflicts
```
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/views/groups/group_members/index.html.haml
both modified: app/views/projects/project_members/index.html.haml
```8.3Valery SizovValery Sizov