summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-251-1/+3
* Merge branch 'fix-raspi-issues' into 'master'Clement Ho2018-06-251-1/+4
* Merge branch 'dm-favicon-redirect' into 'master'Sean McGivern2018-06-181-0/+6
* Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-reque...Douwe Maan2018-06-121-1/+5
* Merge branch 'leipert-add-memory-info' into 'master'Tim Zallmann2018-06-111-1/+0
* Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ...2018-06-07-code-freeze-ee2018-06-07-code-freezeTim Zallmann2018-06-082-32/+10
|\
| * approve @webassemblyjs packages (MIT license)Mike Greiling2018-06-081-0/+6
| * add monaco-editor-webpack-plugin and update webpack configMike Greiling2018-06-071-32/+4
* | Merge branch 'jl-update-error-rate-to-percent' into 'master'Mike Greiling2018-06-071-4/+4
|\ \ | |/ |/|
| * Update NGINX error rate to a percentageJoshua Lambert2018-06-061-4/+4
* | Merge branch 'feature/customizable-favicon' into 'master'Douwe Maan2018-06-075-1/+21
|\ \
| * | force minimagick to use graphicsmagickAlexis Reigel2018-06-051-0/+3
| * | whitelist allowed file types for custom faviconsAlexis Reigel2018-06-051-0/+14
| * | register ico mime typeAlexis Reigel2018-06-051-0/+2
| * | allow uploading favicon in appearance settingsAlexis Reigel2018-06-052-1/+2
| |/
* | Merge branch '44790-disabled-emails-logging' into 'master'Sean McGivern2018-06-071-1/+4
|\ \
| * | 44790: Disable the action mailer base logging when emails are disabledMarc Shaw2018-06-031-1/+4
* | | Merge branch '45505-lograge_formatter_encoding' into 'master'Kamil Trzciński2018-06-071-0/+2
|\ \ \
| * | | Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter and fi...Imre Farkas2018-06-061-0/+2
| | |/ | |/|
* | | Merge branch 'sh-log-422-responses' into 'master'2018-06-07-RC-cutSean McGivern2018-06-071-0/+1
|\ \ \
| * | | Log response body to production_json.log when a controller responds with a 42...Stan Hu2018-06-061-0/+1
* | | | Resolve "Introduce new navigation themes in GitLab 11.0"Annabel Gray2018-06-071-3/+8
|/ / /
* | | Merge branch 'live-trace-v2-persist-data' into 'master'Kamil Trzciński2018-06-061-0/+3
|\ \ \
| * | | Rename worker to ArchiveTracesCronWorkerShinya Maeda2018-06-061-3/+3
| * | | Fix name of worker for cron worker specShinya Maeda2018-06-061-1/+1
| * | | Rename find_stale. Fix worker name in declaration.Shinya Maeda2018-06-061-3/+3
| * | | Changed cron interval to every 17 minuteShinya Maeda2018-06-061-1/+1
| * | | Change cron period to per hourShinya Maeda2018-06-061-1/+1
| * | | Simplify RescueStaleLiveTraceWorkerShinya Maeda2018-06-061-2/+2
| * | | Added flush-to-db process for the cron worker. Rename to RescueStaleLiveTrace...Shinya Maeda2018-06-061-3/+3
| * | | Rescue stale live tracesShinya Maeda2018-06-061-0/+3
| |/ /
* | | Initial setup GraphQL using graphql-ruby 1.8Bob Van Landuyt2018-06-061-2/+4
* | | Convert from GraphQL::Batch to BatchLoaderNick Thomas2018-06-051-6/+0
* | | Add a minimal GraphQL APINick Thomas2018-06-052-0/+9
|/ /
* | Merge branch 'rails5-fix-46236' into 'master'Yorick Peterse2018-06-051-1/+8
|\ \
| * | Support rails5 in postgres indexes function and fix some migrationsJasper Maes2018-06-051-1/+8
* | | Update validatorpresigned-multipart-uploadsKamil Trzciński2018-06-041-9/+15
* | | Support presigned multipart uploadsKamil Trzciński2018-06-042-7/+13
|/ /
* | Fix attr_encryption key settingsStan Hu2018-06-021-8/+15
|/
* Add comment about the need for truncating keys in Ruby 2.4sh-add-ruby-2.4-commentStan Hu2018-06-011-0/+7
* Merge branch 'sh-bump-ruby-2.4' into 'master'Stan Hu2018-06-012-0/+7
|\
| * Upgrade to Ruby 2.4.4sh-bump-ruby-2.4Stan Hu2018-05-292-0/+7
* | Add "deny disk access" Gitaly feature (tripswitch)Jacob Vosmaer (GitLab)2018-06-012-6/+10
* | Merge branch '46481-preserve-warnings-even-if-passed' into 'master'Douwe Maan2018-06-012-9/+2
|\ \
| * | Introduce Gitlab::Auth.omniauth_setup_providersLin Jen-Shin2018-06-011-7/+1
| * | Eliminate constants warnings by:Lin Jen-Shin2018-06-012-6/+5
* | | Merge branch 'add-moneky-patch-for-using-stream-upload-with-carrierwave' into...Kamil Trzciński2018-06-011-0/+69
|\ \ \
| * | | Revise commentsadd-moneky-patch-for-using-stream-upload-with-carrierwaveShinya Maeda2018-05-281-3/+2
| * | | Clean up patchShinya Maeda2018-05-281-9/+31
| * | | Fix rubocop namespaceShinya Maeda2018-05-281-5/+5
View Lorry Controller Status