summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hot-reload' into 'master'Tim Zallmann2017-06-231-0/+4
|\
| * hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
* | Merge branch '31574-bootstrap-form-builder' into 'master'Phil Hughes2017-06-231-0/+7
|\ \
| * | Convert app/views/profiles/show.html.haml to bootstrap_formNick Thomas2017-06-221-0/+7
* | | Merge branch 'rs-revert-bootsnap' into 'master'Stan Hu2017-06-221-12/+0
|\ \ \
| * | | Revert "Merge branch 'rs-bootsnap' into 'master'"rs-revert-bootsnapRobert Speicher2017-06-221-12/+0
* | | | Merge branch 'mk-add-datetime-with-timezone-table-definition' into 'master'Yorick Peterse2017-06-222-14/+81
|\ \ \ \
| * | | | Fix MySQL schema dump for `timestamp`mk-add-datetime-with-timezone-table-definitionMichael Kozono2017-06-221-4/+30
| * | | | Fix PostgreSQL schema dump for `timestamptz`Michael Kozono2017-06-221-5/+36
| * | | | Add `datetime_with_timezone` to table definitionMichael Kozono2017-06-221-6/+16
| | |/ / | |/| |
* | | | Merge branch '33940-cache-flipper_gate-query' into 'master'Robert Speicher2017-06-221-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Add the Flipper::Middleware::Memoizer middlewareRémy Coutable2017-06-211-0/+4
| |/ /
* | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...28717-additional-metrics-review-branchPawel Chojnacki2017-06-227-26/+237
|\ \ \ | |/ /
| * | Enable Style/DotPosition Rubocop :cop:Grzegorz Bizon2017-06-211-2/+2
| * | 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
* | | | | move additional_metrics.yaml into prometheus/ config folderPawel Chojnacki2017-06-161-0/+0
* | | | | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-1621-23/+233
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |\
View Lorry Controller Status