Commit graph

8 commits

Author SHA1 Message Date
Dmitriy Zaporozhets
cf353bd34f Fixed spinach test 2013-01-15 17:12:53 +02:00
Dmitriy Zaporozhets
953db8477e More fixes for test 2013-01-15 14:28:04 +02:00
Dmitriy Zaporozhets
ac983319d3 fixing some test 2013-01-15 12:42:54 +02:00
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
Dmitriy Zaporozhets
68eb394824 Green button when we create new item, blue when save or some primary action 2013-01-06 00:08:02 +02:00
Riyad Preukschas
0b3df2f128 Add merge request note feature 2012-12-03 22:51:55 +01:00
Vincent Bonmalais
80fb38de7a Remove backward compatibility of factories. 2012-11-13 22:27:45 +11:00
Nihad Abbasov
79eb5ab396 refactor feature steps 2012-09-10 08:35:03 -07:00
Renamed from features/steps/project_merge_requests.rb (Browse further)