summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'prune-web-hook-logs' into 'master'Douwe Maan2018-07-031-0/+4
|\
| * Prune web hook logs older than 90 daysYorick Peterse2018-07-021-0/+4
* | Remove CarrierWave initializerStan Hu2018-06-292-53/+0
|/
* Enabling Doorkeeper reuse_access_token optionFrancisco Javier López2018-06-291-1/+1
* Fix OAuth application authorization screen to appear with every accessFrancisco Javier López2018-06-291-0/+50
* Merge branch 'feature/oidc-subject-claim' into 'master'Douwe Maan2018-06-281-2/+7
|\
| * Don't hash user ID in OIDC subject claimMarkus Koller2018-06-281-2/+7
* | Fix spelling: Uncommment -> UncommentStan Hu2018-06-271-1/+1
* | Add RepositoryCheck::DispatchWorker to start worker per shardToon Claes2018-06-271-1/+1
|/
* Migrate storage nesting check to GitalyJacob Vosmaer (GitLab)2018-06-272-28/+1
* Update _scopes_form.html.haml to remove duplicate informationMarcel Amirault2018-06-261-5/+11
* Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-251-1/+3
|\
| * Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
* | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-252-7/+12
|\ \
| * | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-212-7/+12
* | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-241-0/+1
| |/ |/|
* | Merge branch 'fix-webpack-node-env' into 'master'Clement Ho2018-06-212-1/+1
|\ \ | |/ |/|
| * disable nodeEnv within karma configfix-webpack-node-envfix-foo-testMike Greiling2018-06-211-0/+1
| * enable accidentally-disabled nodeEnv optimizationMike Greiling2018-06-211-1/+0
* | Allow omnibus to disable sourcemaps in memory constrained environmentsMike Greiling2018-06-211-1/+4
* | [Rails5] Fix ActionCable's mount_path configurationblackst0ne-rails5-fix-action-cable-mount-pathblackst0ne2018-06-211-1/+1
* | Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-w...Rémy Coutable2018-06-201-0/+7
|\ \
| * | [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routesblackst0ne2018-06-201-0/+7
| |/
* | More gitaly disk access blocksJacob Vosmaer (GitLab)2018-06-202-0/+2
|/
* Redirect favicon.(png|ico) to actual favicon asset or uploaddm-favicon-redirectDouwe Maan2018-06-181-0/+6
* [Rails5] Fix optimistic lock valueblackst0ne2018-06-151-52/+59
* Merge branch 'rails5-database' into 'master'Sean McGivern2018-06-141-0/+10
|\
| * Use data_source_exists? instead of table_exists?rails5-databaseJarka Kadlecová2018-06-141-0/+10
* | [Rails5] Pass class references instead of strings to middleware builderblackst0ne-rails5-update-middlewaresblackst0ne2018-06-132-3/+4
* | Merge branch 'sh-update-unicorn-rb-example' into 'master'Robert Speicher2018-06-121-0/+11
|\ \
| * | Clean up stale Prometheus metrics in before_exec unicorn hooksh-update-unicorn-rb-exampleStan Hu2018-06-111-0/+11
* | | Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wik...blackst0ne2018-06-121-1/+1
|/ /
* | Merge branch 'leipert-add-memory-info' into 'master'Tim Zallmann2018-06-111-1/+0
|\ \
| * | set max_old_space_size to 3.5 GB for compile-assets jobLukas Eipert2018-06-111-1/+0
* | | Add missing `:comment` attributeJan Provaznik2018-06-101-1/+6
|/ /
* | Merge branch '5974-geo-unauthenticated-rate-limits-should-not-block-geo-reque...Douwe Maan2018-06-081-1/+5
|\ \
| * | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/58765974-geo-unauthenticated-rate-limits-should-not-block-geo-requestsValery Sizov2018-05-291-1/+5
* | | 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
|\ \ \ \ \
View Lorry Controller Status