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

..

api

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

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

assets

move assets from lib directory to vendor

2012-05-29 17:56:48 +05:00

backup

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

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

ci

Merge branch 'caches' into 'master'

2015-11-12 09:39:56 +00:00

gitlab

Merge branch 'mirror-repository' into 'master'

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

omni_auth

Add reset_session for the :reset_session strategy.

2015-04-24 20:10:32 +02:00

rouge/formatters

Merge master from CE

2015-08-17 14:01:32 +02:00

support

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

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

tasks

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

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

disable_email_interceptor.rb

Add email interceptor to prevent mail sending if email sending is disabled.

2014-10-27 13:05:50 +01:00

email_validator.rb

More rubocop rules enable

2015-02-02 21:31:03 -08:00

event_filter.rb

Fix rubocop warnings in lib

2015-10-03 01:29:58 -05:00

extracts_path.rb

Only render 404 page from /public

2015-10-13 20:12:34 +03:00

file_size_validator.rb

Support configurable attachment size via Application Settings

2015-04-02 00:04:08 -07:00

file_streamer.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

gitlab.rb

Merge master from CE

2015-08-17 14:01:32 +02:00

gt_one_coercion.rb

diff unfold

2014-08-14 15:48:14 +04:00

repository_cache.rb

Store commit count in project table

2015-07-17 15:22:56 +02:00

static_model.rb

Fixed styles, ProjectHook specs etc

2013-01-05 00:35:38 +02:00

unfold_form.rb

Gitlab Issue 707: Indent unfolded code 1 character

2015-07-22 09:58:17 -04:00

uploaded_file.rb

Implement Build Artifacts

2015-11-10 12:51:50 +01:00

version_check.rb

Replace host with real one

2015-05-11 18:21:45 +03:00