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

..

benchmarks

Merge branch 'create-project-performance' into 'master'

2015-11-04 10:14:30 +00:00

controllers

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-15 00:30:17 -05:00

factories

Merge remote-tracking branch 'origin/master' into ce-to-ee

2015-11-16 17:05:47 +02:00

features

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

finders

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

fixtures

No HTML-only email please

2015-08-21 16:09:55 -07:00

helpers

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

javascripts

Apply new design to files page

2015-10-13 16:41:48 +02:00

lib

Merge remote-tracking branch 'origin/master' into ce-to-ee

2015-11-16 17:05:47 +02:00

mailers

Merge remote-tracking branch 'origin/master' into ce_upsteram

2015-11-05 14:26:35 +02:00

models

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

requests

Merge remote-tracking branch 'origin/master' into ce-to-ee

2015-11-16 13:37:13 +02:00

routing

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-09-16 10:26:10 +02:00

services

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

support

Merge branch 'improve_jira_issue_closing' into 'master'

2015-11-06 04:47:21 +00:00

tasks/gitlab

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

views/help

Allow non-admin users to see version information

2015-09-23 17:18:15 -04:00

workers

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

factories_spec.rb

Remove the invalid key factories

2015-04-11 17:12:10 -04:00

factories.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee

2015-08-10 16:01:53 +02:00

rails_helper.rb

Started on the actual rspec 3 upgrade

2015-06-22 12:12:49 +02:00

spec_helper.rb

Merge remote-tracking branch 'origin/master' into ce_upstream_15_10

2015-10-15 16:46:48 +03:00

teaspoon_env.rb

teaspoon install

2015-05-28 18:22:32 -04:00