Marin Jankovski
3e875b05b4
Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
Gemfile
Gemfile.lock
app/assets/javascripts/project_new.js.coffee
app/controllers/projects_controller.rb
app/models/group.rb
app/models/project.rb
app/models/project_services/jira_service.rb
app/models/project_team.rb
app/models/user.rb
app/services/files/create_service.rb
app/views/layouts/nav/_admin.html.haml
config/routes.rb
db/schema.rb
spec/models/jira_service_spec.rb
spec/requests/api/projects_spec.rb
2015-01-29 11:34:43 -08:00
..
2015-01-19 21:43:25 -08:00
2014-12-15 14:55:55 +01:00
2014-08-20 14:25:55 +02:00
2014-10-14 16:01:45 +02:00
2014-12-29 10:44:08 +01:00
2014-06-03 23:16:31 +02:00
2014-09-29 13:38:43 +02:00
2014-09-28 15:47:53 +02:00
2014-09-28 13:59:33 +02:00
2014-09-29 16:10:32 +02:00
2014-09-28 15:47:53 +02:00
2014-09-29 16:13:02 +02:00
2014-09-28 13:59:33 +02:00
2015-01-08 20:37:35 -08:00
2014-10-01 15:30:29 +02:00
2014-09-28 15:47:53 +02:00
2014-12-16 10:01:37 +01:00
2015-01-19 21:43:25 -08:00
2014-08-20 16:24:17 +02:00
2014-09-28 15:47:53 +02:00
2014-12-01 09:40:56 +01:00
2014-12-01 09:40:56 +01:00
2014-09-28 15:47:53 +02:00
2014-09-29 16:10:32 +02:00
2014-10-15 13:08:55 +02:00
2014-09-28 15:47:53 +02:00
2014-10-14 16:12:22 +02:00
2014-09-28 13:59:33 +02:00
2014-08-07 10:27:54 +02:00
2014-12-29 10:44:08 +01:00
2015-01-29 11:34:43 -08:00
2014-09-28 15:47:53 +02:00
2014-09-28 13:59:33 +02:00
2014-09-28 15:47:53 +02:00
2014-06-27 11:29:18 +02:00
2014-09-28 15:47:53 +02:00
2015-01-23 11:18:10 -08:00