gitlabhq/app/assets/javascripts
Riyad Preukschas 3022786948 Merge commit 'master' into discussions
Conflicts:
	app/assets/stylesheets/sections/notes.scss
	app/contexts/notes/load_context.rb
	app/models/project.rb
	app/observers/note_observer.rb
	app/roles/votes.rb
	app/views/commit/show.html.haml
	app/views/merge_requests/_show.html.haml
	app/views/merge_requests/diffs.js.haml
	app/views/merge_requests/show.js.haml
	app/views/notes/_note.html.haml
	features/steps/project/project_merge_requests.rb
	spec/models/note_spec.rb
2013-01-15 00:52:25 +01:00
..
behaviors Rename JS behaviors 2012-12-03 22:51:56 +01:00
extensions Make notes JS know which notes are new in a request 2012-12-03 22:51:56 +01:00
admin.js.coffee Improve admin logs 2012-11-29 07:49:11 +03:00
application.js Merge pull request #1937 from riyad/add-file-line-links 2012-11-16 03:46:43 -08:00
commits.js Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler." 2012-06-20 21:01:27 +03:00
dashboard.js.coffee replace javascript:void with preventDefault 2013-01-09 21:02:41 +00:00
gfm_auto_complete.js.coffee refactoring gfm_autocomplete 2012-12-20 20:52:12 +02:00
issues.js Remove unused styles. Restyled Issues a bit 2013-01-05 14:49:08 +02:00
main.js.coffee Labels autocomplete 2012-12-18 06:14:05 +03:00
merge_requests.js.coffee Fix merge_request js -> ci_path 2013-01-05 23:26:14 +02:00
milestones.js.coffee Improve milestone show page 2013-01-07 14:08:03 +02:00
notes.js Fix comment and reply buttons 2013-01-02 20:49:27 +01:00
pager.js Speedup dashboard via loading events with ajax 2013-01-07 14:36:01 +02:00
profile.js.coffee Refactored profile to resource. Added missing flash notice on successfull updated. Update username via ajax 2012-12-02 13:29:24 +02:00
projects.js.coffee BranchGraph now loads async 2012-12-07 19:06:46 +01:00
tree.js.coffee fixed the bug of URIDECODE error 2012-11-28 10:09:55 +08:00