Robert Speicher
|
ed2a8ba600
|
Merge 8-2-stable into 8-2-stable-ee
Conflicts remaining:
- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
|
2015-11-19 10:33:18 -05:00 |
|
Sander Boom
|
38a93a25f3
|
Fixed linting error 'variables should be a map of key-valued strings'
|
2015-10-21 22:52:17 +02:00 |
|
Cyriac Thomas
|
05f29a5cb3
|
Simplified sentence as per @stanhu's note
|
2015-09-26 19:37:55 +00:00 |
|
Cyriac Thomas
|
922c635b67
|
Fixed grammar on Using Docker Build doc.
|
2015-09-26 18:15:58 +00:00 |
|
Kamil Trzcinski
|
1b464bfe03
|
Update documentation and config files
|
2015-09-16 00:28:59 +02:00 |
|
Douwe Maan
|
046b283127
|
Groundwork for merging CI into CE
|
2015-08-25 18:42:46 -07:00 |
|