Alfredo Sumaran 5c10b29700 Merge remote-tracking branch 'origin/master' into issue_14904 ... # Conflicts: # app/views/shared/issuable/_sidebar.html.haml		2016-04-20 17:26:47 -05:00
..
api	Fix setting of "action" for Grape transactions	2016-04-20 22:42:52 +02:00
assets	…
backup	Make sure there is a connection before using ActiveRecord	2016-02-08 17:31:24 +01:00
banzai	Instrument Banzai code	2016-04-11 17:43:12 +02:00
ci	Fix Build#append_trace method usage when trace file doesn't exists yet	2016-04-20 11:54:06 +02:00
gitlab	Merge remote-tracking branch 'origin/master' into issue_14904	2016-04-20 17:26:47 -05:00
omni_auth	…
rouge/formatters	Remove custom Lexer. #3945 [ci skip]	2016-01-08 15:20:48 -05:00
support	Remove deprecated NGINX CI config	2016-04-14 20:31:19 +03:00
tasks	Use rake db:reset instead of db:setup	2016-04-14 15:53:54 +02:00
award_emoji.rb	Emoji categories fix	2016-04-14 20:45:55 +03:00
banzai.rb	Add a PreProcessPipeline	2016-03-02 22:19:36 -05:00
disable_email_interceptor.rb	…
event_filter.rb	…
extracts_path.rb	…
file_size_validator.rb	Get rid of more requires, which causes warnings when code is reloaded	2016-04-19 11:48:10 +02:00
file_streamer.rb	…
gitlab.rb	Add `Gitlab.com?` method	2016-04-12 17:30:11 -04:00
gt_one_coercion.rb	…
repository_cache.rb	…
static_model.rb	…
unfold_form.rb	…
uploaded_file.rb	…
version_check.rb	Update version check images to use SVG	2016-01-05 14:35:29 -05:00