gitlabhq/app/models
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
..
concerns Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
.gitkeep init commit 2011-10-09 00:36:38 +03:00
ability.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
commit.rb Remove unused methods 2013-01-05 13:11:15 +02:00
event.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
gitlab_ci_service.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
group.rb Improve perfomance of removeing group 2012-12-30 14:26:19 +02:00
issue.rb more refactoring using models/concerns 2013-01-03 09:06:07 +02:00
key.rb Fix few bugs and tests after refactoring ownership logic 2013-01-02 19:32:34 +02:00
merge_request.rb more refactoring using models/concerns 2013-01-03 09:06:07 +02:00
milestone.rb Changed wording if milestone already expired, using Date#past 2012-12-23 21:16:51 +00:00
namespace.rb replaced system() calls with FileUtils.* method 2013-01-03 15:36:50 +01:00
note.rb Merge commit 'master' into discussions 2013-01-15 00:52:25 +01:00
project.rb email via sidekiq. start and stop rake tasks 2013-01-09 08:44:05 +03:00
project_hook.rb Reannotated 2012-11-20 14:19:55 +02:00
protected_branch.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
repository.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
service.rb move activated? method to service 2013-01-03 09:52:14 +02:00
service_hook.rb Reannotated 2012-11-20 14:19:55 +02:00
snippet.rb Rework of milestones 2012-12-14 08:34:05 +03:00
system_hook.rb sidekiq 2013-01-09 08:14:05 +03:00
team.rb Continue refactoring. Use repostory and team 2013-01-04 08:43:25 +02:00
tree.rb REpostiry, Team models 2013-01-03 21:09:18 +02:00
user.rb Validate username uniq in scope of namespace 2013-01-07 17:36:24 +02:00
users_project.rb Remove unused methods 2013-01-05 13:11:15 +02:00
web_hook.rb Reannotated 2012-11-20 14:19:55 +02:00
wiki.rb Remove unused methods 2013-01-05 13:11:15 +02:00