home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
67 Commits
Author SHA1 Message Date
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets 5f15ed04fc Respect current controller scope when using search from project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-02 22:38:45 +02:00
Dmitriy Zaporozhets b23b78ada1 Merge pull request #7866 from cirosantilli/input-button-to-tag 
Use button type=submit instead of input.
 2014-10-28 12:11:15 +02:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-10-10 15:39:48 +03:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Ciro Santilli 6294033024 Use button type=submit instead of input. 2014-10-01 11:12:56 +02:00
Dmitriy Zaporozhets 0e78d00bcb Merge pull request #7695 from coverer/search_wiki 
Added search wiki feature
 2014-09-09 16:50:43 +03:00
Charles Bushong 858dbd0842 Updating to persist a params snippets variable 2014-09-05 13:30:55 -04:00
Ralf Seidler d93b046c4c Added search wiki feature 2014-09-05 13:36:43 +02:00
Charles Bushong b1411e90f8 Changing some formatting for the Hound, modifying some UI text 2014-09-02 08:33:23 -04:00
Charles Bushong 4cca1b050a Adding in snippet search functionality 
http://feedback.gitlab.com/forums/176466-general/suggestions/5529795-search-though-snippets
 2014-08-29 15:32:07 -04:00
Dmitriy Zaporozhets 1056d91c67 Improve search results output. Fixes some markup issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-28 11:06:19 +03:00
Dmitriy Zaporozhets 7f4b993793 Forgot to save file :) 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:54:18 +03:00
Dmitriy Zaporozhets 043f275900 Skip description if not exist 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:49:45 +03:00
Dmitriy Zaporozhets 8b00d01c67 Search by issue/mr title and description 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:47:30 +03:00
Dmitriy Zaporozhets 7e59a8fee8 Improve comment search results 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 12:37:31 +03:00
Dmitriy Zaporozhets 13f6dc1a94 Save search options when switch between filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 11:55:42 +03:00
Dmitriy Zaporozhets c3ad51a0e4 Improve search tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 10:48:51 +03:00
Dmitriy Zaporozhets ede08dbdd7 Implement search page with filtering of results and pagination 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-27 09:57:50 +03:00
Dmitriy Zaporozhets d3067379a4 Fix project search showing always no results if no merge requests matches 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-11 12:48:00 +03:00
Robert Schilling f361be9eca Restyle search page 
Use ruby 1.9 syntax
 2014-08-11 11:34:45 +02:00
Robert Schilling da7e14c864 fix searching on empty project, prevent 500 
Fix hound
 2014-08-11 11:31:37 +02:00
Dmitriy Zaporozhets 198c2e40b0 Fix labels showing if issue closed on search results page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-07-03 20:08:03 +03:00
NotSqrt 15e0ab498d Update ability to search in issue descriptions and comments 2014-05-15 19:54:19 +02:00
Dmitriy Zaporozhets 87415ab2a6 Add bottom margin to nav-tabs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-02-15 13:41:48 +02:00
Dmitriy Zaporozhets 89ab7e79ad Highlight code search results 2014-01-30 13:31:56 +02:00
Dmitriy Zaporozhets fc60c391ae Improve search page UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 12:51:20 +02:00
Dmitriy Zaporozhets b49ebf5737 Use new context for search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 12:37:12 +02:00
Dmitriy Zaporozhets b512fbc0ec Style search page for twbs3 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-02 14:33:15 +02:00
Dmitriy Zaporozhets 5fa805a7ba Restyle issue form. Replace inputs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-01 22:11:18 +02:00
Dmitriy Zaporozhets 010a770b3f Migrate forms and inputs pt1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-31 02:50:36 +02:00
Dmitriy Zaporozhets 16eb3ac360 Update form classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-31 01:27:02 +02:00
Dmitriy Zaporozhets d618a5fec3 Refactor search views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-11-06 09:58:43 +02:00
Dmitriy Zaporozhets 434c034159 Iid improvemets 
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
 2013-08-19 22:53:11 +03:00
Dmitriy Zaporozhets 5a7f15fbab Show label closed on search result 2013-08-15 11:51:40 +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 e3f9bd231b use control-group classes for inline forms in rest pages 2013-08-07 23:32:20 +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 3805797cae scss: rename file_content to file-content etc 2013-07-13 09:52:47 +03:00
Dmitriy Zaporozhets c78393ec17 Remove $.ready events 2013-06-21 22:08:16 +03:00
Dmitriy Zaporozhets a0ab5e4326 remove preserve for blob since its fails in production 2013-05-14 20:46:17 +03: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 6e1ee1fea6 made some ui enhancement for search page 2013-05-09 11:47:09 +03:00
Dmitriy Zaporozhets f1126f494c Move files search to gitlab_git 2013-05-09 11:47:09 +03:00
Javier CastroandDmitriy Zaporozhets ad947bc705 Fix missing div container for nice css styling 2013-05-09 11:47:08 +03:00
Javier CastroandDmitriy Zaporozhets 7f57fe5034 Implemented code search feature 2013-05-09 11:47:08 +03:00
Dmitriy Zaporozhets e84df44ea0 Redesign search filters 2013-03-14 13:11:20 +02:00
Dmitriy Zaporozhets 033aa1a885 refactor buttons pt1 2013-01-29 22:18:19 +02:00