Commit Graph

15 Commits

Author SHA1 Message Date
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 9a3cab6bf6
Cleanup
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 22:23:32 +03:00
Dmitriy Zaporozhets e93f6b030a
Improve discussions
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets a49d45db41
Move reply button to helper from view
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 13:34:46 +03:00
Dmitriy Zaporozhets 3befe6ec33
Fix show/hide discussion link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 18:57:57 +03:00
Dmitriy Zaporozhets 8290c9a67f
Use proper classes for sdiff content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 09:51:50 +02:00
Dmitriy Zaporozhets 9a31844e2a
Remove unnecessary ago keyword
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-30 14:49:22 +02:00
Drew Blessing fa817dffea Add time ago tooltips to show actual date/time
Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip
2013-12-14 15:24:12 -06:00
Steven Thonus 65cad57a35 avatar upload on profile page 2013-10-09 09:05:09 +02: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 af5faaf0e1 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
Izaak Alpert 532809a173 Revert note.project references back to @project
-removed extranious space from new_merge_request_email.text.erb

Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42
2013-07-17 22:48:03 -04:00
Izaak Alpert 489fa5d726 MR on Fork multiple fixes
-Disable observers post test run
-Allow db:seed_fu RAILS_ENV=test to be run more than once without error
-fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
-make notes/commits render against proper project
-MR discussion file links should reference note's project
-Added tests for commit links on edit merge request
-fixes edit issues (canceling an edited mr, updating an edited mr)
-updates tests with checks for source code updates
-still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)

MR API: error on bad target_project

-If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
-Fixes some busted (but hidden) test cases

Conflicts:
	app/views/merge_requests/show/_diffs.html.haml
	spec/features/notes_on_merge_requests_spec.rb

Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
2013-07-17 22:42:51 -04:00
Dmitriy Zaporozhets 2ed7cbfba4 Move projects controllers/views in Projects module 2013-06-23 19:47:22 +03:00