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-02 00:20:19 +01:00
2014-10-18 18:07:46 -05:00
2015-01-27 12:19:32 -08:00
2014-12-02 11:31:57 +02:00
2014-02-23 10:34:39 +01:00
2014-10-05 18:21:11 +02:00
2013-05-06 15:09:41 +03:00
2014-11-14 16:06:39 +02:00
2014-11-18 17:14:36 +02:00
2014-10-29 11:42:51 +02:00
2014-09-29 12:11:53 +03:00
2014-12-30 12:48:29 +02:00
2014-07-29 11:49:46 +02:00
2014-12-11 18:12:45 +02:00
2014-10-05 18:21:11 +02:00
2015-01-29 11:34:43 -08:00
2014-07-11 19:53:10 +02:00
2015-01-08 20:37:35 -08:00
2014-10-05 18:21:11 +02:00
2014-06-14 12:36:46 +03:00
2014-07-24 23:25:38 +03:00
2014-10-14 18:23:51 +03:00
2014-05-07 11:52:07 +02:00