Lin Jen-Shin 567ef6c175 Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name ... * upstream/master: (123 commits) Limit the size of SVGs when viewing them as blobs Add a spec for ProjectsFinder project_ids_relation option Fix ProjectsFinder spec Pass project IDs relation to ProjectsFinder instead of using a block Speed up todos queries by limiting the projects set we join with Used phantomjs variable Ability to specify branches for pivotal tracker integration Fix a memory leak caused by Banzai::Filter::SanitizationFilter Update phantomjs link Remove sleeping and replace escaped text. Filters test fix Fixed filtering tests Removed screenshot command 💩 Updated failing tests Used mirrored version on GitLab Updated tests Fix `U2fSpec` for PhantomJS versions > 2. Fix file downloading Install latest stable phantomjs Use new PhantomJS version ...		2016-08-16 00:14:26 +08:00
..
environments	Remove quiet_assets in favor of built-in sprockets-rails config.	2016-06-30 16:18:05 -06:00
initializers	Instrument Project.visible_to_user	2016-08-12 16:43:10 +02:00
locales	Minor fixes after a final look at the diff.	2016-05-11 10:30:47 +05:30
application.rb	Deduplicated resque.yml loading from several places	2016-08-04 18:55:37 +02:00
aws.yml.example	Add a note that changing example configuration files requires changing omnibus-gitlab.	2015-06-11 15:11:37 +02:00
boot.rb	Enable the Rubocop DeprecatedClassMethods cop	2016-05-08 15:33:34 -06:00
database.yml.env	Improving the "Environment variables" administration doc	2016-02-01 19:10:46 +01:00
database.yml.mysql	set the collation to utf8_general_ci	2014-08-13 14:45:23 +01:00
database.yml.postgresql	Remove 'socket' example PostgreSQL parameter	2014-07-01 18:27:50 +02:00
dependency_decisions.yml	Whitelist 'Simplified BSD' license	2016-07-26 15:25:15 -06:00
environment.rb	Rails update to 4.2.4	2015-11-25 18:18:44 +02:00
gitlab.yml.example	Update default path for repository_downloads_path in gitlab.yml.example	2016-07-21 10:31:49 -03:00
license_finder.yml	Resolve feedback.	2016-06-06 13:39:36 -06:00
mail_room.yml	Synced mail_room.yml with the one in omnibus	2016-08-04 18:55:37 +02:00
newrelic.yml	Revert "Remove newrelic gem. Closes #12860"	2016-02-23 07:25:37 -08:00
resque.yml.example	Added Redis Sentinel support documentation	2016-08-04 18:55:37 +02:00
routes.rb	Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-build-name	2016-08-16 00:14:26 +08:00
secrets.yml.example	Groundwork for merging CI into CE	2015-08-25 18:42:46 -07:00
sidekiq.yml.example	bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed this	2016-02-18 18:58:51 +00:00
unicorn.rb.example	Fix typos and grammar	2016-02-10 12:43:19 +02:00
unicorn.rb.example.development	Increase unicorn timeout to 60 seconds	2014-09-23 17:11:16 +03:00