Commit graph

11 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
20c65f3bcb Search: show recent issues/mr first 2013-08-15 11:54:16 +03:00
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
a43a380394 Increase amount of search results for issues, mr, projects 2013-08-07 22:51:36 +03:00
Izaak 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
9d9b78823d Fix paginate of blobs, fixed preserve in dev mode for blob results 2013-05-14 20:25:16 +03:00
Dmitriy Zaporozhets
46daf01a15 Search for blobs by default inside project. Added pagination for blobs search 2013-05-14 20:11:48 +03:00
Dmitriy Zaporozhets
f1126f494c Move files search to gitlab_git 2013-05-09 11:47:09 +03:00
Javier Castro
7f57fe5034 Implemented code search feature 2013-05-09 11:47:08 +03:00
Dmitriy Zaporozhets
0ae892007d Remove Wiki and db table since we use gollum now 2013-04-10 22:20:00 +03:00
Ilya Baryshev
e6524a919e Wiki search
Very basic, using LIKE, and no search snippets.
2012-10-16 23:05:11 +04:00
randx
679d0d6d76 Context refactoring. Move Issues list, Search logic to context 2012-10-09 22:09:46 +03:00