Douwe Maan ae7b2ef62c Merge branch 'master' into issue_12658 ...

# Conflicts:
#	app/models/issue.rb
#	app/views/projects/_home_panel.html.haml
#	app/views/shared/projects/_project.html.haml
#	db/schema.rb
#	spec/models/project_spec.rb

2016-03-21 23:22:21 +01:00

..

api

Merge branch 'master' into issue_12658

2016-03-21 23:22:21 +01:00

assets

move assets from lib directory to vendor

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

backup

Make sure there is a connection before using ActiveRecord

2016-02-08 17:31:24 +01:00

banzai

Merge branch 'master' into feature/issue-move

2016-03-19 18:50:15 +01:00

ci

Merge remote-tracking branch 'origin/master' into gitlab-ci-yaml-updates

2016-03-11 14:22:49 +01:00

gitlab

Merge branch 'master' into issue_12658

2016-03-21 23:22:21 +01:00

omni_auth

Fix signin with OmniAuth providers

2015-12-08 14:58:15 +01:00

rouge/formatters

Remove custom Lexer. #3945 [ci skip]

2016-01-08 15:20:48 -05:00

support

Do not serve anything via nginx as we have workhorse

2016-03-11 15:04:04 +01:00

tasks

Follow the CSS Style Guide rules for unitless zero values.

2016-03-16 19:23:23 -06:00

award_emoji.rb

Emoji picker: better alias handling

2015-12-24 11:28:55 +02:00

banzai.rb

Add a PreProcessPipeline

2016-03-02 22:19:36 -05: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

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

Revert "Merge branch 'revert-satellites' into 'master' "

2015-08-11 14:33:31 +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

Update version check images to use SVG

2016-01-05 14:35:29 -05:00