home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
1930 Commits
Author SHA1 Message Date
Izaak AlpertandIzaak Alpert 3d7194f011 Merge Request on forked projects 
The good:

 - You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
 - Push events take into account merge requests on forked projects
 - Tests around merge_actions now present, spinach, and other rspec tests
 - Satellites now clean themselves up rather then recreate

The questionable:

 - Events only know about target projects
 - Project's merge requests only hold on to MR's where they are the target
 - All operations performed in the satellite

The bad:

  -  Duplication between project's repositories and satellites (e.g. commits_between)

(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos)

Fixes:

Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request

Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
 2013-07-17 22:41:30 -04:00
Dmitriy Zaporozhets 8587e3a357 create corresponding events when create branch/tag with UI 2013-07-17 15:11:03 +03:00
Dmitriy Zaporozhets 403638b8a0 Feature: add git tag via ui 2013-07-17 14:43:18 +03:00
Dmitriy Zaporozhets 9ea5766c35 Improve permissions on tags/branches 2013-07-17 08:26:00 +03:00
Dmitriy Zaporozhets cbe9f56afa Ability to create new branch via UI 2013-07-17 00:09:23 +03:00
Dmitriy Zaporozhets 132caae734 Move repo tags to own controller. add ability to remove tags 2013-07-16 23:12:52 +03:00
Dmitriy Zaporozhets a165a0b23f Create event on dashboard when branch removed via UI 2013-07-16 22:43:14 +03:00
Dmitriy Zaporozhets 7a167cf1f7 Move branches list to own controller with pagination. Ability to remove branches from UI 2013-07-16 22:19:07 +03:00
Dmitriy Zaporozhets 3b660be6ee REmove duplicating search on dashboard issues/mr 2013-07-12 21:49:03 +03:00
Dmitriy Zaporozhets dc038a7108 Rename Group#people to Group#members 2013-07-12 19:01:39 +03:00
Dmitriy Zaporozhets 3232f547ac Add group button at Profile#groups page 2013-07-12 18:29:39 +03:00
Dmitriy Zaporozhets acb402a1c1 Ability to leave group from profile area 2013-07-12 18:22:03 +03:00
Dmitriy Zaporozhets 223d264051 Sanitize user attrs on model level 2013-07-10 13:48:03 +03:00
Dmitriy Zaporozhets 63e532eff0 Cache MR diffs result. Improve diff output 2013-07-08 20:12:35 +03:00
Dmitriy Zaporozhets ee890f2b2a Merge branch 'master' into 6-0-dev 
Conflicts:
	app/views/dashboard/projects.html.haml
	app/views/layouts/_head_panel.html.haml
	config/routes.rb
 2013-07-02 11:47:09 +03:00
Jack Weeden 22c00e6462 Removed before_filter as authentication is done within update method 2013-07-01 10:48:02 +01:00
Jack Weeden 1216a62e3b Authorize user on note update 2013-07-01 10:48:02 +01:00
Jack Weeden 6a84d92672 Added update and delete_attachment actions to note controller 2013-07-01 10:47:39 +01:00
Dmitriy Zaporozhets 6e550af150 Show shotcut dialog on ? 2013-06-30 22:10:52 +03:00
Scott PustayandAriejan de Vroom 2000f013f7 fixed typo in assgned 2013-06-29 16:37:41 +03:00
Dmitriy Zaporozhets 1dd80d22a5 Prevent confusion in naming user variable at admin area 2013-06-26 15:57:02 +03:00
Dmitriy Zaporozhets 112e919823 Remove unnecessary namespaced resource 2013-06-26 15:02:28 +03:00
Dmitriy Zaporozhets a5dbe35354 Improve change group ownership logic 2013-06-26 14:51:57 +03:00
Dmitriy Zaporozhets dc91755264 Cache graph log 2013-06-25 13:55:03 +03:00
Dmitriy Zaporozhets 05a7e8b9c0 Better design for SSH keys page 2013-06-24 19:25:10 +03:00
Dmitriy Zaporozhets 3e09e6f7b8 Move Profile related controllers under Profiles:: module 2013-06-24 18:24:14 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 102aaf0682 Use simple render syntax in controllers 2013-06-22 15:08:11 +03:00
Dmitriy Zaporozhets ee13297af2 Cleanup: removed unused routing/methods. Improved admin area usability 2013-06-22 14:11:20 +03:00
Dmitriy Zaporozhets 0bc714c271 Remove form for adding user to several projects from admin area. 
Remove unnecessary projects order on User#show
 2013-06-22 13:41:08 +03:00
Dmitriy Zaporozhets 8d70ac008d Merge branch 'master' into 6-0-dev 
Conflicts:
	VERSION
	db/schema.rb
 2013-06-22 11:19:12 +03:00
Dmitriy Zaporozhets 9de23248d8 You should not be able to remove a Group owner 2013-06-22 11:02:31 +03:00
Dmitriy Zaporozhets dc0f08f8d8 Show also group members on project page at admin area 2013-06-22 00:11:06 +03:00
Dmitriy Zaporozhets fdf7fc044a Make it possible to assign/mention users from group members 2013-06-22 00:02:09 +03:00
Dmitriy Zaporozhets ede746bf07 prevent document unbind since it breaks rails ujs 2013-06-21 23:47:42 +03:00
Dmitriy Zaporozhets fe514b17ab Adding groups to notification settings 2013-06-21 23:17:58 +03:00
Dmitriy Zaporozhets 86d9ed9a0a Fix user add to group from admin area 2013-06-20 12:06:44 +03:00
Dmitriy Zaporozhets 1811d32e23 Squash project settings navs 2013-06-19 22:44:57 +03:00
Dmitriy Zaporozhets 4a53e0285c Merge branch 'improve/dash_projects_page' of /home/git/repositories/gitlab/gitlabhq into 6-0-dev 2013-06-19 16:50:28 +00:00
Dmitriy Zaporozhets b3ef63a0a5 Migrate global project taks. Removed more teams related functionality 2013-06-19 19:48:48 +03:00
Dmitriy Zaporozhets cf8b465cb9 Remove Global namespace from options. Prepared file for migration of global projects 2013-06-19 18:32:08 +03:00
Dmitriy Zaporozhets 63a67bb4ab Remove second search. More compact list. Additional filter 2013-06-19 17:48:43 +03:00
Dmitriy Zaporozhets 2a63f64f24 Remove team factories and few links 2013-06-18 21:44:04 +03:00
Dmitriy Zaporozhets d899fcdd2d Merge pull request #4325 from zzet/patch-1 
Remove unused but slow code
 2013-06-18 11:31:17 -07:00
Dmitriy Zaporozhets 439f399bec Remove all team resources except models. Move models to deprecated directory 2013-06-18 21:22:34 +03:00
Dmitriy Zaporozhets 60bb351617 Prevent page crash if failed to parse graphs data 2013-06-18 18:58:33 +03:00
Dmitriy Zaporozhets 48019f1a0f Update admin area with new group memberships 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 32ef2f37f6 Add owner to group members after group create 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets ed9cff9a3c Restyle project members page to fit both group and personal projects 2013-06-18 17:47:52 +03:00
Dmitriy Zaporozhets 5bed576ac2 Show group members on project team page 2013-06-18 17:47:52 +03:00