summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Reload remote file the cacheds file is already removedShinya Maeda2018-05-281-0/+3
| * | | Use prepend to correctly use the monketpatch's methodShinya Maeda2018-05-281-24/+28
| * | | Fix static analysisShinya Maeda2018-05-281-5/+5
| * | | Add a monkey pach of https://github.com/carrierwaveuploader/carrierwave/pull/...Shinya Maeda2018-05-281-0/+41
* | | | Update 404 and 403 pagesPaul Slaughter2018-05-311-0/+1
| |/ / |/| |
* | | Export assigned issues in iCalendar feedImre Farkas2018-05-314-2/+5
* | | better handle a missing gitlab-shell versionBrett Walker2018-05-301-2/+2
* | | Merge branch 'sh-use-grape-path-helpers' into 'master'Sean McGivern2018-05-301-51/+0
|\ \ \
| * | | Replace grape-route-helpers with our own grape-path-helpersStan Hu2018-05-301-51/+0
| | |/ | |/|
* | | Add `shared_projects` endpointBob Van Landuyt2018-05-291-0/+1
|/ /
* | Merge branch '45190-create-notes-diff-files' into 'master'Douwe Maan2018-05-281-0/+1
|\ \ | |/ |/|
| * Persist truncated note diffs on a new table45190-create-notes-diff-filesOswaldo Ferreira2018-05-241-0/+1
* | Merge branch '46600-fix-gitlab-revision-when-not-in-git-repo' into 'master'Rémy Coutable2018-05-252-2/+2
|\ \
| * | Replace Gitlab::REVISION with Gitlab.revision and handle installations withou...46600-fix-gitlab-revision-when-not-in-git-repoRémy Coutable2018-05-242-2/+2
| |/
* | Merge branch 'sh-disable-background-metrics-in-tests' into 'master'Robert Speicher2018-05-241-1/+1
|\ \
| * | Disable the background Prometheus sampler in testssh-disable-background-metrics-in-testsStan Hu2018-05-241-1/+1
| |/
* | Merge branch '46741-add-access-control-allow-headers-wds' into 'master'Mike Greiling2018-05-241-1/+4
|\ \ | |/ |/|
| * Add `Access-Control-Allow-Headers` to Webpack Dev Server configKushal Pandya2018-05-241-1/+4
* | Merge branch '45175-cache-json-instead-of-activerecord-objects-in-appearance-...Douwe Maan2018-05-231-3/+0
|\ \