home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 05:36:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,314 Commits 48 Branches 340 Tags
747807fa418d5f030d48a998bccff8a74e9318d2
Commit Graph
271 Commits
Author SHA1 Message Date
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
Valery Sizov c67bafca31 Merge remote-tracking branch 'origin/master' into ce-to-ee 2015-11-16 17:05:47 +02:00
Marin Jankovski 14032d8eb1 Add support for git lfs. 2015-11-16 12:39:13 +01:00
Robert Speicher 37fe73c337 Merge remote-tracking branch 'ce/master' into ce-to-ee 2015-11-15 00:30:17 -05:00
Kamil Trzcinski 6384c757b7 Expose CI enable option in project features 
- Enable CI by default for all new projects
 2015-11-13 10:52:50 +01:00
Valery Sizov 93bcc9ca7f Merge remote-tracking branch 'origin/master' into ce_upsteram 2015-11-05 14:26:35 +02:00
KON YUICHI 31723eb9f0 fix deprecated 2015-10-31 22:32:06 +09:00
kazubu 0bfb9cbf38 modify to use redirect_back_or_default function 2015-10-26 15:06:55 +09:00
kazubu c3d48f9735 Fix: 500 error returned if destroy request without HTTP referer 2015-10-26 15:06:55 +09:00
Valery Sizov 0f30be02eb Merge remote-tracking branch 'origin/master' into ce_upstream 2015-10-23 13:01:19 +02:00
Douwe Maan f9cd0639c1 Merge branch 'master' into grzesiek/gitlab-ce-fix/non-member-notification-button 
[ci skip]
 2015-10-19 13:49:52 +02:00
Douwe Maan 157d891615 Add changelog item 2015-10-19 11:40:13 +02:00
Douwe Maan 8adeda37b5 Merge branch 'hanloong/gitlab-ce-remove-forks-from-projects-settings' into 'master' 
Add ability to remove the fork relationship from project settings

![Screen_Shot_2015-10-18_at_12.37.24](/uploads/676571642a4c90f7f286280d714599a3/Screen_Shot_2015-10-18_at_12.37.24.png)
![Screen_Shot_2015-10-18_at_12.37.28](/uploads/1a069ecfc4cd3b5438772a9c3f04b6fc/Screen_Shot_2015-10-18_at_12.37.28.png)

Replaces !1579.

Fixes #2578.

See merge request !1636
 2015-10-19 09:32:07 +00:00
Douwe Maan 42cbc7f813 Tweak wording. 2015-10-18 12:38:01 +02:00
Douwe Maan 99b8568ff7 Find correct group membership. 2015-10-18 12:19:30 +02:00
Douwe Maan ff866faf2f Only load tree when project has repository to prevent 404 2015-10-18 11:22:33 +02:00
Douwe Maan 6bd9a9fbf7 Set vars used by tree view in project show action. 2015-10-17 19:16:40 +02:00
Han Loong Liauw 0bea5ced8b Made suggested content changes based on MR Review 
Changed the authentication method for removing fork through API
Reflected changes to new auth method in API specs
 2015-10-14 20:19:41 +11:00
Han Loong Liauw df99ddbba1 Adds ability to remove the forked relationship 
This was previously possible through the API but can now be done
through the project#edit settings screen if the current user is
the owner of the project.
Update changelog
 2015-10-13 21:42:17 +11:00
Grzegorz Bizon b8f5e7427f Show notifications button even if user is not member of a project 
Notifications button was unavailable if user wasn't member of the
project, even if protected project is available via group privileges.

Showing disabled button with explanation tool-tip is less confusing.

This closes #2846.
 2015-10-12 12:07:31 +02:00
Hannes Rosenögger ba8464bed2 add issues template 2015-10-08 16:49:21 +02:00
Cristian Bica c528043439 Allow users to select the Files view as default project view 2015-10-01 17:05:20 +03:00
Dmitriy Zaporozhets 80a983b492 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-22 12:25:41 +02:00
Douwe Maan 47e926bec0 Minor code cleanup 2015-09-20 19:09:43 +02:00
Patricio Cano 23f9a64566 Use the find_by_user_id magic finder instead of where. 2015-09-16 21:02:40 -05:00
Patricio Cano 1ef2ce95d5 Merge branch 'master' into notification-levels 2015-09-16 19:52:57 -05:00
Dmitriy Zaporozhets 1ba393de81 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 2015-09-16 10:26:10 +02:00
Patricio Cano 01cc20378b Notification dropdown now shows currently active level, and also shows what the actual value of global is, if the project has the notification level set to global. 2015-09-14 20:33:24 -05:00
Patricio Cano adcae6ebd5 Notification level can now be saved from within the project view. 2015-09-14 19:27:54 -05:00
Darby 84508c40b7 PAtrially working notification button 2015-09-14 16:37:11 -07:00
Douwe Maan f87f6480b2 Use new routing helper 2015-09-08 17:53:16 +01:00
Douwe Maan 1489d225d6 Move partial to right place and fix tests. 2015-09-08 15:14:14 +01:00
Douwe Maan 5d785457db Clean up overlap between dashboard and explore. 
- Split up SnippetsController into separate dashboard and explore sections.
- Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
 2015-09-08 14:49:20 +01:00
Dmitriy Zaporozhets baebeb487a Migrate projects with rebase feature enabled 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 16:55:17 +02:00
Dmitriy Zaporozhets e5f75999bf Add ff-merge only checkbox to project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-27 14:21:13 +02:00
Dmitriy Zaporozhets c3a24cb81f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee 2015-08-10 09:57:49 +02:00
Stan Hu d4c1c1ab48 Fix inability to save "Reset approvals on push" setting 
Closes gitlab-org/gitlab-ce#2140
 2015-07-31 07:19:27 -07:00
Douwe Maan f949245a84 Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee 2015-07-31 16:12:46 +02:00
Achilleas Pipinellis 0fac66f84d Mention group and project name in flash messages upon create, update and delete. 2015-07-30 01:22:16 +03:00
Douwe Maan f032b15dcf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee 
# Conflicts:
#	README.md
#	app/controllers/projects_controller.rb
#	db/schema.rb
#	doc/workflow/README.md
#	lib/gitlab/satellite/merge_action.rb
 2015-07-23 13:40:31 +02:00
Valery Sizov c61e7dd4ac Public project activity page asks for sign-in 2015-07-20 13:54:56 +03:00
Valery Sizov 3cc78d8998 Approvers: UI for project settings 2015-07-17 17:58:33 +03:00
Dmitriy Zaporozhets c84b14d2a1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/controllers/autocomplete_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/controllers/projects/services_controller.rb
	app/helpers/projects_helper.rb
	app/services/audit_event_service.rb
	db/schema.rb
	doc/api/users.md
	doc/update/6.x-or-7.x-to-7.13.md
	features/project/project.feature
 2015-07-14 15:40:46 +02:00
Douwe MaanandRobert Speicher b93053695a Fix transferring of project to another group using the API. 2015-07-11 16:47:33 -04:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 23:21:35 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:25:34 +02:00
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02:00
Dmitriy Zaporozhets 8c830688aa Add ability to change amount of required approvals in project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-09 17:14:25 +02:00
Dmitriy Zaporozhets a83d0034e3 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/services/files/base_service.rb
	app/services/files/create_service.rb
	app/services/files/delete_service.rb
	app/services/files/update_service.rb
	doc/workflow/README.md
 2015-06-08 18:24:34 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00