summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into '41416-making-instance-wide-data-tools-more-access...Luke Bennett2018-07-317-8/+37
|\
| * Merge branch 'todos-visibility-change' into 'master'Sean McGivern2018-07-311-0/+1
| |\
| | * Delete todos when users loses target read permissionsJarka Kadlecová2018-07-301-0/+1
| * | Merge branch 'feature/gb/login-activity-metrics' into 'master'Sean McGivern2018-07-311-5/+25
| |\ \
| | * | Improve authentication activity code readabilityGrzegorz Bizon2018-07-311-4/+6
| | * | Fix rubocop offense in warden initializersGrzegorz Bizon2018-07-271-2/+2
| | * | Catch custom warden events too to increment metricsGrzegorz Bizon2018-07-271-9/+15
| | * | Make authentication metrics events explicit is specsGrzegorz Bizon2018-07-261-1/+1
| | * | Track blocked users and two factor authenticationsGrzegorz Bizon2018-07-231-6/+5
| | * | Refactor blocked user tracker classGrzegorz Bizon2018-07-201-11/+12
| | * | Rename authentication activity observer methodsGrzegorz Bizon2018-07-191-2/+2
| | * | Implement scaffold of authentication activity metricsGrzegorz Bizon2018-07-171-0/+12
| * | | Merge branch 'sh-simplify-liveness-check' into 'master'Robert Speicher2018-07-302-0/+5
| |\ \ \
| | * | | Use /-/health instead of breaking /-/livenessStan Hu2018-07-282-2/+3
| | * | | Simplify /-/liveness check to avoid connecting to the databaseStan Hu2018-07-282-1/+5
| | | |/ | | |/|
| * | | Move rbtrace initialization into SidekiqStan Hu2018-07-302-5/+2
| * | | Make rbtrace work under unicornStan Hu2018-07-302-1/+7
| |/ /
* | | Spec instance statisticsBob Van Landuyt2018-07-271-1/+1
* | | Scope instance_statistics to dashLuke Bennett2018-07-272-2/+3
* | | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-273-4/+9
|/ /
* | Revert "Merge branch '41416-making-instance-wide-data-tools-more-accessible' ...Sean McGivern2018-07-273-8/+4
* | Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'ma...Sean McGivern2018-07-273-4/+8
|\ \
| * | Spec instance statisticsBob Van Landuyt2018-07-271-1/+1
| * | Scope instance_statistics to dashLuke Bennett2018-07-262-2/+3
| * | Create instance_statistics namespace and move convdev index and cohorts to itLuke Bennett2018-07-263-4/+7
* | | Merge branch 'ce-7000-introduce-PolicyCheckable' into 'master'Grzegorz Bizon2018-07-271-0/+1
|\ \ \
| * | | Introduce PolicyCheckable for checking policiesce-7000-introduce-PolicyCheckableLin Jen-Shin2018-07-251-0/+1
* | | | Merge remote-tracking branch 'dev/master'Felipe Artur2018-07-262-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'security-fj-missing-csrf-system-hooks' into 'master'Felipe Artur Cardozo2018-07-262-2/+2
| |\ \ \
| | * | | Changing the hook test action to use POSTFrancisco Javier López2018-07-232-2/+2
* | | | | Moved repo.css to its own CSS bundle to reduce the size of the main bundleTim Zallmann2018-07-261-0/+1
* | | | | Merge branch '31576-redirect-commits-to-root-if-no-ref' into 'master'Douwe Maan2018-07-261-0/+1
|\ \ \ \ \
| * | | | | Transfer to commits_controller, add test, and update changelogKia Mei Somabes2018-07-241-1/+1
| * | | | | Redirect commits to root_ref if no ref is providedKia Mei Somabes2018-07-201-0/+1
* | | | | | Merge branch 'bvl-graphql-wip-mutation' into 'master'Douwe Maan2018-07-261-1/+2
|\ \ \ \ \ \
| * | | | | | Add mutation toggling WIP state of merge requestsBob Van Landuyt2018-07-251-1/+2
| | |/ / / / | |/| | | |
* | | | | | Replace issues time tracking progress bar with gitlab-ui's progress barClement Ho2018-07-251-0/+6
* | | | | | Merge branch 'sh-include-rbtrace' into 'master'Douwe Maan2018-07-251-0/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add rbtrace to Gemfilesh-include-rbtraceStan Hu2018-07-251-0/+3
| |/ / / /
* | | | | Disables Rack Attack by defaultTiago Botelho2018-07-251-1/+1
|/ / / /
* | | | Merge branch 'dz-refactor-object-store-settings' into 'master'Rémy Coutable2018-07-242-23/+19
|\ \ \ \
| * | | | Make ObjectStoreSettings use more explicit and add specsdz-refactor-object-store-settingsDmitriy Zaporozhets2018-07-242-7/+8
| * | | | Create class responsible for default object store settingsDmitriy Zaporozhets2018-07-232-24/+19
| | |/ / | |/| |
* | | | Remove instrumentation Rouge::Plugins::{Redcarpet,CommonMark}Stan Hu2018-07-231-2/+0
|/ / /
* | | Merge branch 'sh-remove-banzai-instrumentation' into 'master'Yorick Peterse2018-07-231-14/+0
|\ \ \
| * | | Remove method instrumentation for Banzai filters and reference parserssh-remove-banzai-instrumentationStan Hu2018-07-221-14/+0
* | | | Merge branch 'fix-theme-index' into 'master'Douwe Maan2018-07-231-8/+8
|\ \ \ \
| * | | | Fix theme index to match realityBalasankar "Balu" C2018-07-231-8/+8
| |/ / /
* | | | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-232-6/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-202-6/+1