home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 15:46:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,096 Commits 48 Branches 340 Tags
3ee46726c5231b5c7f8b3bf45cfb700ebcaf414d
Commit Graph
140 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets e06352979d st_diff field for Note 2013-08-04 19:00:41 +03:00
Dmitriy Zaporozhets d19d094b93 Remove ugly button and truncate too long project names. Remove unecessary newlines 2013-07-30 14:12:24 +03:00
Izaak Alpert d99594273d Style changes from review with @randx 
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
 2013-07-17 22:48:03 -04:00
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 5181816970 Merge branch 'master' into 6-0-dev 2013-07-12 14:42:35 +03:00
Dmitriy Zaporozhets 2a7ae176c1 Merge pull request #4282 from bke-drewb/3904 
Increase snippet content column size.
 2013-07-11 09:50:21 -07:00
Dmitriy Zaporozhets 113d2ff525 store and display public key fingerprint 2013-06-24 20:07:21 +03:00
Dmitriy Zaporozhets 9787c37aed More db index 2013-06-22 15:01: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 f060645119 Add notification level to group membership 2013-06-21 23:17:20 +03:00
Dmitriy Zaporozhets 81697850eb create UsersGroup entity. Modify ability to check group owners instead one owner 2013-06-18 17:47:52 +03:00
Nihad Abbasov 43d2e7b104 add db index for authentication_token column in users table 2013-06-14 22:07:09 +05:00
Dmitriy Zaporozhets e7c930a55b Add imported boolean to project. Prevent shell from creating repo after it was imported 2013-06-14 16:30:48 +03:00
Dmitriy Zaporozhets 6838304a85 Force user password change for users created by admin 2013-06-13 21:06:27 +03:00
Dmitriy Zaporozhets 94be732026 Add password_expires_at to users table 2013-06-13 20:01:35 +03:00
Drew Blessing ca69099f2c Increase snippet content column size. 
This will fix issue #3904
 2013-06-11 21:11:05 -05:00
Dmitriy Zaporozhets bcc4e4dc7e Merge branch 'gist' of https://github.com/Andrew8xx8/gitlabhq into Andrew8xx8-gist 
Conflicts:
	Gemfile.lock
	app/models/ability.rb
	app/models/project.rb
	app/views/snippets/_form.html.haml
	db/schema.rb
	features/steps/shared/paths.rb
	spec/factories.rb
	spec/models/project_spec.rb
 2013-06-04 18:36:22 +03:00
Dmitriy Zaporozhets 8bc0a06cd4 Add more fields to project service model 2013-05-22 17:21:05 +03:00
Dmitriy Zaporozhets 749d3383cc Add migration code for existing deploy keys 2013-05-06 17:42:13 +03:00
Dmitriy Zaporozhets 8e4625af61 Remove project_id from keys table 2013-05-06 15:10:05 +03:00
Dmitriy Zaporozhets a735ce2aa7 migrations for ssh key STI and deploy keys <-> projects relation 2013-05-06 12:27:54 +03:00
Angus MacArthur ec63804831 Made fixes suggested by @randx in pull request 
See https://github.com/gitlabhq/gitlabhq/pull/3597#discussion-diff-4014638
 2013-05-02 16:41:33 -04:00
Angus MacArthur ae33fdf297 updated fork feature to use gitlab-shell for v5 of gitlab 2013-04-15 01:54:52 -04:00
Dmitriy Zaporozhets 0ae892007d Remove Wiki and db table since we use gollum now 2013-04-10 22:20:00 +03:00
Dmitriy Zaporozhets 4496a747c6 Improve migration AddLastActivityColumnIntoProject to use real last activity date if present 2013-04-09 20:58:47 +03:00
Dmitriy Zaporozhets 0f2798d498 Merge branch 'feature/refactoring_scopes_pr' of https://github.com/Undev/gitlabhq into Undev-feature/refactoring_scopes_pr 
Conflicts:
	db/schema.rb
 2013-04-09 20:37:04 +03:00
Dmitriy Zaporozhets 3c3baf8f6d add notification level to UsersProject 2013-04-04 22:11:15 +03:00
Andrey Kumanyaev 734d6fcdf0 Perfomance updating Project activity sort 2013-04-03 06:21:04 +04:00
Dmitriy Zaporozhets 4b3950456d notification level for user 2013-03-26 10:48:07 +02:00
Andrew8xx8 b3dc4fb721 Migrations to convert data added 2013-03-25 00:39:38 +04:00
Andrew8xx8 5b35000f16 Snippets feature refactored. Tests now use spinach 2013-03-24 22:31:14 +04:00
Andrew8xx8 bc7c5f87bb Project snippet moved to separate model 2013-03-24 19:26:49 +04:00
Andrew8xx8 cc869d5dc1 Private field added to snippet 2013-03-23 22:14:37 +04:00
Dmitriy Zaporozhets b765a7958d Move snippets to own tab as feature. Make it disabled for new projects by default 2013-03-18 23:33:41 +02:00
Dmitriy Zaporozhets 8cad1c9f4c add dark solarized theme for code preview 2013-03-15 15:09:34 +02:00
Andrew8xx8 c6d6bd6ab4 Typo fixed 2013-03-05 14:29:44 +04:00
Andrew8xx8 9a06dd4aa1 Migrations added 2013-03-04 18:51:00 +04:00
Dmitriy Zaporozhets 5c3cb47c16 Merge branch 'team-and-group-descriptions' of https://github.com/Undev/gitlabhq into Undev-team-and-group-descriptions 
Conflicts:
	db/schema.rb
 2013-03-01 16:05:51 +02:00
Dmitriy Zaporozhets e1f77b9be0 Merge branch 'link-to-issue-tracker' of https://github.com/Undev/gitlabhq into Undev-link-to-issue-tracker 
Conflicts:
	Gemfile.lock
 2013-02-28 17:02:20 +02:00
Andrew8xx8 5f657203a1 Description added to temas 2013-02-28 17:15:22 +04:00
Andrew8xx8 9f45e01e84 Description to groups added 2013-02-28 17:14:21 +04:00
Andrew8xx8 f13600845d Migration added 2013-02-28 16:11:13 +04:00
Andrew8xx8 e6d2e56961 Issue tracker field added to projects 2013-02-28 16:10:00 +04:00
Andrew8xx8 4a55c69877 Data converting migrations was wrong. Fixed 2013-02-27 12:53:36 +04:00
Dmitriy Zaporozhets d7b667fee2 Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2 
Conflicts:
	app/models/merge_request.rb
 2013-02-26 10:38:40 +02:00
Dmitriy Zaporozhets c3659ef2e5 Fix merge request migration for postgres 2013-02-25 08:53:49 +02:00
Andrew8xx8 8ba27b7b46 Migrations for convertion merge_status added 2013-02-20 17:49:33 +04:00
Andrew8xx8 d58eb62d68 Migrations iproved 2013-02-19 11:32:10 +04:00
Andrew8xx8 e5f048f44d Migrations refactored ro support data convertion 2013-02-18 18:54:30 +04:00