summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-remove-opclasses-patch' into 'master'Mayra Cabrera2019-07-231-211/+0
|\
| * Remove PostgreSQL opclasses monkey patchsh-remove-opclasses-patchStan Hu2019-07-231-211/+0
* | Speed up boot timeSergey Alekseev2019-07-231-5/+1
|/
* Merge branch 'sh-enable-bootsnap' into 'master'Douglas Barbosa Alexandre2019-07-231-1/+1
|\
| * Make Bootsnap available via ENABLE_BOOTSNAP=1Stan Hu2019-07-191-1/+1
* | Merge branch 'FixLocaleEN' into 'master'Bob Van Landuyt2019-07-231-6/+0
|\ \
| * | Remove duplicated mapping key in config/locales/en.ymlPeter Dave Hello2019-07-221-6/+0
| |/
* | Merge branch '6544-remove-scss-diff-ce' into 'master'Phil Hughes2019-07-231-0/+6
|\ \
| * | Resolve difference in app/assets/stylesheets/application.scss6544-remove-scss-diff-ceLukas Eipert2019-07-221-0/+6
| |/
* | Merge branch 'ce-4946-resolve-ee-config' into 'master'Robert Speicher2019-07-221-0/+1
|\ \
| * | Port EE specific settings to CELin Jen-Shin2019-07-221-0/+1
| |/
* | Fix xterm CSS not loadingMike Greiling2019-07-221-1/+4
|/
* Move frontend fixtures into spec/frontendMike Greiling2019-07-191-1/+1
* Move frontend fixtures to tmp/testsMike Greiling2019-07-191-2/+8
* Merge branch 'an-sidekiq-chaos' into 'master'Lin Jen-Shin2019-07-182-1/+2
|\
| * Adds chaos endpoints to Sidekiqan-sidekiq-chaosAndrew Newdigate2019-07-182-1/+2
* | Merge branch 'bjk/usage_ping' into 'master'Stan Hu2019-07-181-5/+9
|\ \
| * | Update usage ping cron behaviorbjk/usage_pingBen Kochie2019-07-181-5/+9
* | | Merge branch 'sh-add-rugged-logs' into 'master'Douglas Barbosa Alexandre2019-07-181-0/+7
|\ \ \
| * | | Add Rugged calls and duration to API and Rails logsStan Hu2019-07-181-0/+7
| |/ /
* | | Merge branch 'add-profile-mode-to-extend-request-profiling' into 'master'Kamil Trzciński2019-07-181-1/+1
|\ \ \
| * | | Add profile mode to extend request profilingadd-profile-mode-to-extend-request-profilingQingyu Zhao2019-07-181-1/+1
| |/ /
* | | Fix pid providing for PrometheusAleksei Lipniagov2019-07-181-2/+1
* | | Merge branch 'sh-fix-redis-performance-bar' into 'master'Mayra Cabrera2019-07-181-1/+1
|\ \ \ | |/ / |/| |
| * | Fix inconsistency in Redis performance bar statssh-fix-redis-performance-barStan Hu2019-07-171-1/+1
* | | Merge branch 'rs-zz-metrics' into 'master'Lin Jen-Shin2019-07-171-0/+31
|\ \ \ | |/ / |/| |
| * | Add EE-only class instrumentationrs-zz-metricsRobert Speicher2019-07-161-0/+31
| |/
* | Rename Redactor classes to ReferenceRedactorSarah Yasonik2019-07-161-1/+1
* | Don't use transactions and exceptionsReuben Pereira2019-07-161-0/+13
|/
* Make httpclient respect system SSL configurationsh-fix-httpclient-sslStan Hu2019-07-151-0/+18
* Remove obsolete chaos routesremove-obsolete-chaos-routesLuke Bennett2019-07-131-7/+0
* Merge branch 'js-specs-transactions' into 'master'Andreas Brandl2019-07-122-1/+4
|\
| * Use transactions in JS feature specsjs-specs-transactionsHeinrich Lee Yu2019-07-122-1/+4
* | Merge branch 'upgrade-rails-5-2-ce' into 'master'Bob Van Landuyt2019-07-1211-94/+50
|\ \
| * | Upgrade to Rails 5.2upgrade-rails-5-2-ceHeinrich Lee Yu2019-07-1211-94/+50
| |/
* | Merge branch 'group-analytics-frame' into 'master'Lin Jen-Shin2019-07-121-0/+13
|\ \ | |/ |/|
| * Port EE analytics routegroup-analytics-frameLuke Bennett2019-07-111-0/+13
* | Merge branch '64403-remove-setimmediate-polyfill' into 'master'Clement Ho2019-07-111-2/+4
|\ \ | |/ |/|
| * Remove setImmediate polyfill from production assetsMike Greiling2019-07-101-2/+4
* | Merge branch 'improve-chaos-controller' into 'master'Stan Hu2019-07-111-5/+8
|\ \
| * | Add `db_spin` and refactor ChaosControllerimprove-chaos-controllerKamil Trzciński2019-07-111-5/+8
* | | Merge branch '35757-move-issues-in-boards-pderichs' into 'master'Jan Provaznik2019-07-111-1/+5
|\ \ \
| * | | Add endpoint to move multiple issues35757-move-issues-in-boards-pderichsPatrick Derichs2019-07-111-1/+5
| |/ /
* | | Merge branch '490-enable-puma-by-default-in-GDK' into 'master'Grzegorz Bizon2019-07-111-2/+2
|\ \ \ | |/ / |/| |
| * | Enable puma by default in GDK490-enable-puma-by-default-in-GDKQingyu Zhao2019-07-091-2/+2
* | | Add a rubocop for Rails.loggerMayra Cabrera2019-07-106-9/+9
| |/ |/|
* | Copy EE-only config files to CErs-config-parityRobert Speicher2019-07-094-0/+613
* | CE-EE parity for shared config filesRobert Speicher2019-07-093-1/+30
* | Merge branch 'rs-basic-config-files' into 'master'Lin Jen-Shin2019-07-0910-2/+163
|\ \
| * | Add frozen_string_literal to EE files now in CErs-basic-config-filesRobert Speicher2019-07-085-0/+10
View Lorry Controller Status