Commit Graph
72 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets a718a9af3e Restyle labels filter to match common style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:48:02 +02:00
Dmitriy Zaporozhets 638f8541dc Hide labels filter for MRs and remove unnecessary padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:36:03 +02:00
Tudor Pavel 4f6b570fbe Filter issues by multiple labels with Spinach feature spec 2014-02-18 15:38:33 +02:00
Dmitriy Zaporozhets 9b5728057e Restyle issue/mr top filters for list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 19:59:09 +02:00
Takao Baba 208ec627c3 Fix 500 error in Ruby 1.9. 2014-02-05 14:43:20 +09:00
Dmitriy Zaporozhets 89ab7e79ad Highlight code search results 2014-01-30 13:31:56 +02:00
Dmitriy Zaporozhets b75777fd95 no raw data rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-28 11:53:02 +02:00
Dmitriy Zaporozhets b6454591cc Merge branch 'highlight-js' into 'master'
Highlight.Js

Replace pygments code highlight with client-side library - highlight.js

http://highlightjs.org/
2014-01-28 07:58:59 +00:00
Dmitriy Zaporozhets 78b2fb5de9 Add highlight.js support to markdown, snippets etc
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 13:12:58 +02:00
Drew Blessing 8b3b6f1096 Mobile UI improvements for dashboard/nav
Style navbar toggle button

Style navbar toggle manually instead of with button classes

Style navbar

Modify color

Turn off all tooltips for touch devices

Style main nav

Fix scrolling navbar collapse

Style tweaks

Minor tweaks

Style no ssh key message
2014-01-25 10:07:39 -06:00
Dmitriy Zaporozhets 234b86c97f Use FilteringService for project issuus, mrs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:32:44 +02:00
Dmitriy Zaporozhets 6153aa1360 Use FilteringService for Dashboard, Group pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:16:45 +02:00
Dmitriy Zaporozhets 2c071314ae Move issues sort dropdown to shared partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 20:55:42 +02:00
Dmitriy Zaporozhets 8b513fbc50 Improve side filters and make them look similar 2014-01-14 13:51:59 +02:00
Dmitriy Zaporozhets 8a17961126 Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-11 12:11:54 +02:00
Jason Hollingsworth 04baf0b569 Update clone panel to use input group.
Use clone panel in `Git Access` section of wiki.
2014-01-08 10:06:03 -06:00
Dmitriy Zaporozhets d0a56e2280 Move labels css to gl_bootstrap. Fixed label rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-03 23:28:00 +02:00
Dmitriy Zaporozhets 8a2052c0ed Smaller select for ref switcher
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-01 23:13:54 +02:00
Dmitriy Zaporozhets a11d25b181 Responsive improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 15:46:46 +02:00
Dmitriy Zaporozhets 57ab639c0d Dashboard css improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 12:01:48 +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 6cbadc953f css class .hide has \!important so use gl-hide instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-31 00:38:53 +02:00
Dmitriy Zaporozhets 0f72f00ce9 Improve project show page UI
* Fixes overflow with long description
* Fixes overflow for project with long name
* Fixes overflow for non-retina iPad

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-29 12:27:33 +02:00
Dmitriy Zaporozhets 1a2e11c891 Fix per-project counters for Dashboard filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 09:19:51 +02:00
Dmitriy Zaporozhets 16ea2ec189 Merge branch 'feature/all_merge_requets' of /home/git/repositories/gitlab/gitlabhq 2013-12-24 18:59:00 +00:00
Dmitriy Zaporozhets 4c61c46738 Add tests to Dashboard#merge_requests filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 18:22:48 +02:00
Dmitriy Zaporozhets 5953582b65 Show Assigned/Authored/All filter for dashboard issues and mr pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 14:53:52 +02:00
Dmitriy Zaporozhets dac67ed65f Use new ui-box classes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-24 11:45:42 +02:00
Jason Hollingsworth 1521f467cb Update default public pull url.
This updates the default pull URL for public projects when the user
is not logged in.
2013-12-17 12:48:59 -06:00
Drew Blessing d9b5777db1 Allow user to hide the message to add an ssh key permanently
Favor links instead of buttons

Remove unnecessary class

Remove extra space
2013-12-14 20:21:12 -06:00
Steven Thonus 5907207e4d showing as default http link for public repo when anonymous 2013-11-29 09:32:34 +01:00
Dmitriy Zaporozhets 042ec53c40 Minor UI improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-27 11:29:52 +02:00
Dmitriy Zaporozhets b983e9ef0a Add ability to hide no ssh key message
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-11-12 10:19:23 +02:00
Dmitriy Zaporozhets 43dbd7986e Improve git clone panel 2013-10-21 13:06:26 +03:00
Dmitriy Zaporozhets 203bc7bb7e Hide some filters if current_user is nil 2013-09-25 16:54:36 +03:00
Dmitriy Zaporozhets 25a723c3ae Remove colon 2013-08-29 21:49:13 +03:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Henry Smith 4b91ffca3e More specific empty state message wording
I've changed all the instances of "Nothing to show here" to specifically mention
the name of the entity of which there are none to show. This makes for a
slightly smoother reading experience.
2013-08-15 18:31:16 +01:00
Dmitriy Zaporozhets 0175e66589 hide no-ssh message if notice or alert present 2013-08-10 21:20:03 +03:00
Dmitriy Zaporozhets 3281021e8b Rewrite issues/mr filtering logic 2013-08-10 20:25:53 +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
Dmitriy Zaporozhets 27b7aeddfb More compact lists for dashboard issues, mr 2013-08-06 21:22:41 +03:00
Dmitriy Zaporozhets 512cd02335 Dashboard/Group issues and mr pages refactoring 2013-08-06 21:12:01 +03: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 a41875d21e Replace %h5.title with div.title 2013-07-13 20:36:21 +03:00
Dmitriy Zaporozhets 5067e9dc88 Minor UI improve for dashboard events 2013-07-04 17:10:34 +03:00
Dmitriy Zaporozhets afc9d54819 Fix new ssh key link from shared partial 2013-06-24 18:26:57 +03:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00
Dmitriy Zaporozhets 09572e40bc use public_icon/private_icon helper 2013-06-11 10:02:17 +03:00