summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'inline-js-removal-projects-other' into 'master'Phil Hughes2017-07-311-1/+4
|\
| * Converted Pipelines ChartsTim Zallmann2017-07-271-0/+1
| * Moved Inline JS for Pipelines Charts + new Pipeline to dispatcherTim Zallmann2017-07-271-1/+2
| * Project New moved to external FileTim Zallmann2017-07-271-0/+1
* | Ensure Gitlab::Application.routes.default_url_options are set correctly in Ca...Rémy Coutable2017-07-281-1/+1
* | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-5/+8
|\ \
| * | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-5/+8
| |/
* | Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-281-1/+4
|\ \
| * \ Merge branch 'master' into 'sh-augment-lograge-output'Sean McGivern2017-07-281-4/+4
| |\ \
| * | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-1/+4
* | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-281-2/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | refactor users bundle, remove inline javascript, and transform into an async ...Mike Greiling2017-07-181-2/+0
* | | | Merge branch 'sh-fix-lograge-exception' into 'master'Sean McGivern2017-07-281-1/+1
|\ \ \ \
| * | | | Fix lograge exclusion in params sectionsh-fix-lograge-exceptionStan Hu2017-07-281-1/+1
| | |/ / | |/| |
* | | | Rename the metric groups35667-indicate-type-of-metric-for-prometheus-web-application-monitoringJoshua Lambert2017-07-271-4/+4
|/ / /
* | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-3/+3
|\ \ \
| * | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-271-3/+3
* | | | Merge branch 'remove_custom_devise_failure_app' into 'master'Robert Speicher2017-07-271-6/+6
|\ \ \ \
| * | | | Remove GitLab custom fealure app for deviseValery Sizov2017-07-271-6/+6
* | | | | Merge branch 'pawel/prometheus_client_pid_reuse_error' into 'master'Robert Speicher2017-07-271-0/+4
|\ \ \ \ \
| * | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_errorPawel Chojnacki2017-07-271-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-274-0/+30
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | use Module#prepend instead of alias_method_chainAlexis Reigel2017-07-271-16/+12
| * | | | mysql hack: set length for binary indexesAlexis Reigel2017-07-271-0/+25
| * | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-271-0/+2
| * | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-1/+5
| * | | | generate gpg signature on pushAlexis Reigel2017-07-271-0/+1
| * | | | perform signature update in sidekiq workerAlexis Reigel2017-07-271-0/+1
| * | | | add profile gpg key page to manage gpg keysAlexis Reigel2017-07-271-0/+1
| |/ / /
* | | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into '...Douwe Maan2017-07-271-1/+1
|\ \ \ \
| * | | | Ensure test files are deleted after testsPawel Chojnacki2017-07-251-1/+1
* | | | | Support custom directory in gitlab:backup:create taskMarkus Koller2017-07-271-4/+0
| |/ / / |/| | |
* | | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master'Sean McGivern2017-07-271-1/+1
|\ \ \ \
| * | | | Add `rescue false`.blackst0ne2017-07-261-1/+1
| * | | | Refactor CSRF protectionblackst0ne2017-07-261-1/+1
* | | | | Mention how to test LDAP connectionsMichael Kozono2017-07-261-1/+2
* | | | | Update more examplesMichael Kozono2017-07-261-1/+1
* | | | | Copy comment improvements from documentationMichael Kozono2017-07-261-4/+11
* | | | | Add warning about certificate verification on loadMichael Kozono2017-07-261-1/+10
* | | | | Move backwards compatibility logic out of the codeMichael Kozono2017-07-261-1/+5
* | | | | Add LDAP config optionsMichael Kozono2017-07-262-1/+34
|/ / / /
* | | | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master'Sean McGivern2017-07-251-0/+3
|\ \ \ \
| * | | | Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfmTiago Botelho2017-07-251-0/+3
| |/ / /
* | | | Resolve "More RESTful API: include resource URLs in responses"Oswaldo Ferreira2017-07-252-1/+36
|/ / /
* | | How to Merge to external FileTim Zallmann2017-07-241-0/+1
* | | Merge branch '35330-fix-nginx-add-haproxy' into 'master'Tim Zallmann2017-07-241-1/+22
|\ \ \
| * | | Fix for HA ProxyJoshua Lambert2017-07-201-1/+1
| * | | Add HA Proxy metrics, fix NGINXJoshua Lambert2017-07-201-1/+22
* | | | Merge branch 'zj-pipeline-badge-improvements' into 'master'Grzegorz Bizon2017-07-221-1/+3
|\ \ \ \
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-1/+3
| | |/ / | |/| |
View Lorry Controller Status