summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-ee-environment-variable' into 'master'Mike Greiling2019-04-052-3/+3
|\
| * Rename environment variable EE to IS_GITLAB_EEwinh-ee-environment-variableWinnie Hellmann2019-04-052-3/+3
* | Add part of needed codeGosia Ksionek2019-04-051-0/+1
* | Add a Prometheus API per environmentrpereira22019-04-051-0/+2
|/
* Merge branch '54417-graphql-type-authorization' into 'master'Nick Thomas2019-04-041-0/+3
|\
| * GraphQL Type authorizationLuke Duncalfe2019-04-031-0/+3
* | Prevent premailer from converting HTML entitiesHeinrich Lee Yu2019-04-041-1/+2
|/
* Load 'Gitlab::Jira::Middleware' if it existsFelipe Artur2019-04-011-0/+11
* Extract IS_EE config helperWinnie Hellmann2019-03-282-5/+10
* Merge branch '54670-external-diffs-when-outdated' into 'master'Sean McGivern2019-03-283-0/+14
|\
| * Allow external diffs to be used conditionallyNick Thomas2019-03-273-0/+14
* | Log Gitaly RPC duration to api_json.log and production_json.logStan Hu2019-03-271-1/+6
|/
* Merge branch 'winh-remove-sushi' into 'master'Winnie Hellmann2019-03-261-1/+1
* Revert "Merge branch 'winh-remove-sushi' into 'master'"Filipa Lacerda2019-03-221-1/+1
* Merge branch 'da-capitalize-db-apapter-name-on-rails-console' into 'master'Stan Hu2019-03-221-1/+1
|\
| * Add helper method to return a human-friendly name for database adapterDouglas Barbosa Alexandre2019-03-211-1/+1
* | Remove .raw from JavaScript fixture file namesWinnie Hellmann2019-03-211-1/+1
|/
* Merge branch 'send-columns-to-sentry-on-missingattributeerror' into 'master'Stan Hu2019-03-191-0/+15
|\
| * Send schema cache to Sentry on MissingAttributeErrorSean McGivern2019-03-191-0/+15
* | Integrate Gitlab::Keys with Gitlab::ShellPatrick Bajao2019-03-192-0/+3
|/
* Resolve differences in Karma config between CE and EEWinnie Hellmann2019-03-141-15/+19
* Security Dashboard as default view for groupsGilbert Roulot2019-03-141-0/+1
* Move EE-specifics of Karma test bundle behind flagWinnie Hellmann2019-03-131-0/+4
* Merge branch 'winh-ignore-karma-404' into 'master'Mike Greiling2019-03-131-0/+22
|\
| * Hide 404 errors in Karma locallyWinnie Hellmann2019-03-131-0/+22
* | Merge branch 'update-rubocop' into 'master'Stan Hu2019-03-131-4/+2
|\ \
| * | Run rubocop -aNick Thomas2019-03-131-4/+2
* | | Resolve differences in Webpack config between CE and EEWinnie Hellmann2019-03-131-13/+39
|/ /
* | Filter Jira shared secret from logsHeinrich Lee Yu2019-03-131-0/+2
* | Enable/disable Auto DevOps at Group levelMayra Cabrera2019-03-121-0/+1
* | Batch insert CI rspec_profiling dataStan Hu2019-03-121-15/+35
* | Merge branch 'mg-remove-node6-support' into 'master'Clement Ho2019-03-112-8/+8
|\ \
| * | Remove node 6 trailing comma supportMike Greiling2019-03-112-8/+8
* | | Make the Default Reporter `mocha` For KarmaAndrew Fontaine2019-03-111-2/+2
| |/ |/|
* | Filter merge requests by target branchHiroyuki Sato2019-03-091-0/+1
|/
* Update packages comment in gitlab.yml.example [ci skip]Dmitriy Zaporozhets2019-03-071-1/+1
* Merge branch '56937-edit-knative-domain' into 'master'Grzegorz Bizon2019-03-071-0/+1
|\
| * Creates Clusterss::ApplciationsController update endpointJoão Cunha2019-03-051-0/+1
* | Merge branch 'add_ldap_tls_options' into 'master'Douwe Maan2019-03-052-15/+68
|\ \
| * | Allow raw `tls_options` to be passed in LDAP configurationDrew Blessing2019-03-042-15/+68
| |/
* | Merge dev master into GitLab.com masterYorick Peterse2019-03-041-1/+1
|\ \
| * \ Merge branch 'security-50334' into 'master'Yorick Peterse2019-03-041-1/+1
| |\ \
| | * | Fix git clone revealing private repo's presenceMark Chao2019-02-191-1/+1
* | | | Merge branch '40396-sidekiq-in-process-group' into 'master'Stan Hu2019-03-041-0/+3
|\ \ \ \
| * | | | sidekiq: terminate child processes at shutdownNick Thomas2019-03-041-0/+3
* | | | | Types::BaseField accepts authorize after reloadBob Van Landuyt2019-03-041-1/+1
| |_|_|/ |/| | |
* | | | Merge branch '53966-make-hashed-storage-migration-safer-and-more-inviting' in...Douglas Barbosa Alexandre2019-03-011-0/+1
|\ \ \ \
| * | | | Adds Rollback functionality to HashedStorage migrationGabriel Mazetto2019-03-011-0/+1
* | | | | Refactor model and specReuben Pereira2019-03-011-0/+4
|/ / / /
* | | | CE-port for 7714-view-recent-boardsHeinrich Lee Yu2019-03-012-3/+2
|/ / /