summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gitaly-auth-token' into 'master'Sean McGivern2017-06-211-0/+6
|\
| * Enable gitaly token auth when testingJacob Vosmaer2017-06-201-0/+1
| * Rubocop and comment fixesJacob Vosmaer2017-06-201-2/+4
| * Pass Gitaly token on Ruby gRPC requestsJacob Vosmaer2017-06-191-0/+3
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
|\ \
* | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-191-1/+3
| |/ |/|
* | Merge branch 'fix-atom-eslint' into 'master'Tim Zallmann2017-06-181-16/+7
|\ \
| * | refactor zopfli fallback configfix-atom-eslintMike Greiling2017-06-161-15/+6
| * | don't make assumptions about command line arguments invoking webpack configMike Greiling2017-06-161-1/+1
* | | Increase karma socket timeoutMike Greiling2017-06-161-0/+1
|/ /
* | Merge branch 'bvl-missing-translations' into 'master'Douwe Maan2017-06-162-7/+209
|\ \
| * | Take timezone into account when comparing dates in the UIBob Van Landuyt2017-06-151-1/+1
| * | Update timeago tooltips for SpanishBob Van Landuyt2017-06-151-0/+1
| * | Use the same time format as beforeBob Van Landuyt2017-06-151-0/+1
| * | Re-add time_ago_in_wordsBob Van Landuyt2017-06-151-0/+35
| * | Make sure there's only 1 `errors.messages` definition in en.ymlBob Van Landuyt2017-06-151-6/+4
| * | Translate time tooltips.Bob Van Landuyt2017-06-151-32/+199
* | | Merge branch 'speed-up-graphs' into 'master'Rémy Coutable2017-06-161-0/+25
|\ \ \
| * | | Speed up used languages calculation on charts pageSean McGivern2017-06-161-0/+25
| | |/ | |/|
* | | Merge branch 'set_proper_defaults_for_metric_paths' into 'master'Robert Speicher2017-06-161-0/+3
|\ \ \ | |/ / |/| |
| * | set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ruPawel Chojnacki2017-06-151-0/+3
| |/
* | Merge branch 'karma-headless-chrome-redux' into 'master'33592-pipeline-schedules-callout-has-no-top-marginTim Zallmann2017-06-161-1/+21
|\ \
| * | add DEBUG flag option to karma configMike Greiling2017-06-141-6/+17
| * | run chrome with --no-sandbox flag to get around docker privilege limitationsMike Greiling2017-06-141-4/+5
| * | force chrome to produce debug output as it runs in CIMike Greiling2017-06-141-1/+9
| * | replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-141-1/+1
* | | Merge branch 'sh-support-cdns' into 'master'Robert Speicher2017-06-151-1/+1
|\ \ \ | |_|/ |/| |
| * | Rename CDN_HOST to GITLAB_CDN_HOSTStan Hu2017-06-151-1/+1
| * | Support a configurable Rails asset_host to allow for CDNsStan Hu2017-06-141-1/+1
* | | Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-151-0/+3
|\ \ \ | |/ / |/| |
| * | Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commitsSean McGivern2017-06-141-0/+3
| |/
* | Move vue components to vue files and match docsFilipa Lacerda2017-06-141-1/+1
|/
* Revert "Merge branch 'karma-headless-chrome' into 'master'"Mike Greiling2017-06-131-1/+1
* Merge branch '32054-rails-should-use-timestamptz-database-type-for-postgresql...Yorick Peterse2017-06-132-0/+48
|\
| * Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_time...32054-rails-should-use-timestamptz-database-type-for-postgresqlblackst0ne2017-06-132-0/+48
* | replace PhantomJS with headless Chrome as karma test runnerMike Greiling2017-06-131-1/+1
|/
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-124-0/+35
|\
| * Ensure peek-performance_bar doesn't break existing functionalitiesRémy Coutable2017-06-091-0/+4
| * Fix vendor/peek.js so that it can be bundled with WebpackRémy Coutable2017-06-091-1/+0
| * Fix linting, route, and specsRémy Coutable2017-06-092-2/+2
| * Fix Rubocop offenses, improve SQL duration format and changelog entryRémy Coutable2017-06-091-3/+3
| * Small adjustmentsRémy Coutable2017-06-092-1/+1
| * Display queries duration in performance bar queries modalRémy Coutable2017-06-091-30/+12
| * Don't use Pygment,rb, use Rouge instead, and put peek-pg in the :postgres groupRémy Coutable2017-06-091-1/+7
| * Store Sherlock::Query in Peek adapterRémy Coutable2017-06-091-0/+32
| * New performance bar that can be enabled with the `p b` shortcutRémy Coutable2017-06-094-0/+12
* | Add the ability to perform background migrationsYorick Peterse2017-06-121-0/+1
* | Merge branch 'fall-back-to-gzip-when-missing-optional-deps' into 'master'Marin Jankovski2017-06-121-1/+10
|\ \
| * | fall back to gzip when zopfli compression is unavailablefall-back-to-gzip-when-missing-optional-depsMike Greiling2017-06-091-1/+10
* | | Improve Job detail view to make it refreshed in real-time instead of reloadingFilipa Lacerda2017-06-121-0/+2
| |/ |/|
View Lorry Controller Status