home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,987 Commits 48 Branches 340 Tags
f2eb668348bc8ff70d62ee607a080f235f470dfd
Commit Graph
39 Commits
Author SHA1 Message Date
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
Sato Hiroyuki c0e3b39792 Set @options in assing_ref_vars 
@options enable to keep params when switching ref.
 2013-05-13 18:44:33 +09:00
Dmitriy Zaporozhets 7069fac317 Add custom sing-in text & google analytics 2013-05-08 21:03:36 +03:00
Dmitriy Zaporozhets a022fd4164 Restyle clone panel on project show page 2013-04-26 22:12:43 +03:00
Dmitriy Zaporozhets 9ef5573c82 Show project access level right to clone panel 2013-04-26 20:59:29 +03:00
Dmitriy Zaporozhets 142fd2c11d move promo section in shared partial 2013-04-19 18:09:14 +03:00
Dmitriy Zaporozhets 5b06c9a73b apply redesigned MR list to dashboard, group etc 2013-04-06 15:11:47 +03:00
Dmitriy Zaporozhets bf06b3196d Make clone widget read-only 2013-03-04 22:18:53 +02:00
Dmitriy Zaporozhets 152f87864c remove useless warning 2013-02-09 12:32:24 +02:00
Dmitriy Zaporozhets ee43e9248c Add warning if user own projet but not in team. Also show loading when merge MR 2013-01-21 15:05:18 +02:00
Dmitriy Zaporozhets 23e338852c Dont set @project variable in list. Remove a bit of duplication in dash and group 2013-01-14 10:09:01 +02:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets eb3e07a509 Use project owner if no namespace. Restyled team page 2012-11-30 18:26:17 +02:00
Dmitriy Zaporozhets 08fded3fac Minor improvments to UI 2012-11-29 18:09:27 +02:00
Dmitriy Zaporozhets f5551efdfd Rewrite and improve git backend logic. Fix project movind. Raise exception to prevent unexpected issues 2012-11-27 09:31:15 +03:00
Dmitriy Zaporozhets d18e2bd59d styled error message 2012-11-21 06:14:05 +03:00
Dmitriy Zaporozhets 942c410119 Implemented bootstrap 2.2.1.1. Restyled header panel 2012-11-20 23:05:15 +02:00
Valeriy Sizov 9d56c7f657 Update app/views/shared/_no_ssh.html.haml 
TYPO
 2012-10-30 00:29:13 +02:00
Riyad Preukschas 0a9adbbe4a Fix no SSH key warning 2012-10-29 21:51:28 +01:00
Riyad Preukschas 0447ab375a Extract shared/clone_panel partial 2012-10-25 23:39:02 +02:00
Robert Speicher 339dfa32b8 Fix ref_switcher path 2012-09-26 16:32:21 -04:00
Robert Speicher 465e40d3a6 Extract ref switcher into a partial 
Also moves onchange JS to projects.js.coffee
 2012-09-16 12:07:57 -04:00
Dmitriy Zaporozhets aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00