summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | 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
| | | | | | | | | | | | | | | | | | | | And closer to the configuration setup. The code doesn’t need to know about this.
* | | | | 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 instrumentation See merge request !13069
| * | | | 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 NGINX Error Rate query, include HA Proxy See merge request !13005
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipeline badge improvements Closes #15582 and #20961 See merge request !12966
| * | | | Rename build to pipeline for status badgesZ.J. van de Weg2017-07-211-1/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First commit in probably 2, for resolve gitlab-org/gitlab-ce#15582. This commit is renaming files and classes from build to pipeline. Also wording is editted to pipeline. Given `pipeline` had more characters than `build`, I've made the field a bit wider. The width now matchers the one for the coverage badge, so they look nice when in a table format, or in a list. As soon as this commit is merged to master, and released, the build.svg is deprecated, meaning that all users which already placed a badge should update it. However, to make sure it keeps working tests are added for this case.
* | | | Merge branch '31031-convert-protected-branches-es6' into 'master'Filipa Lacerda2017-07-211-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Convert Protected Branches feature JS code to ES6 See merge request !12970
| * | | Update Protected Branches bundle pathkushalpandya2017-07-191-1/+1
| | | |
* | | | Merge branch 'sh-lograge-iso6801-time' into 'master'Stan Hu2017-07-201-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Standardize on ISO8601 UTC time for lograge See merge request !12995
| * | | Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-timeStan Hu2017-07-201-1/+1
| | | |
* | | | Merge branch 'rc/cob-backport-ce-to-ee-fix' into 'master'Robert Speicher2017-07-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLogging See merge request !12987
| * | | | Fix logger disabling on the CI: instantiate an ActiveSupport::TaggedLoggingrc/cob-backport-ce-to-ee-fixRémy Coutable2017-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'fix/gb/fix-container-registry-tag-routing' into 'master'Kamil Trzciński2017-07-201-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix docker tag reference routing constraints Closes #35220 and gitlab-com/support-forum#2246 See merge request !12961
| * | | | Fix docker tag reference routing constraintsGrzegorz Bizon2017-07-191-1/+1
| | | | |
* | | | | Merge branch '33359-pers-snippet-files-location' into 'security-9-3'Sean McGivern2017-07-191-2/+2
| |/ / / |/| | | | | | | | | | | | | | | Use uploads/system directory for personal snippets See merge request !2123
* | | | Merge branch 'authentiq-updates' into 'master'Rémy Coutable2017-07-191-3/+3
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
| * | | Added authentiq provider to tests and updated documentation, gem and config ↵Alexandros Keramidas2017-07-181-3/+3
| | | | | | | | | | | | | | | | file.
* | | | Merge branch 'bvl-free-system-namespace' into 'master'Sean McGivern2017-07-191-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Free `system` namespace by moving uploads into `uploads/-` Closes #33550 See merge request !12917
| * | | | Move system-uploads to `-/system`Bob Van Landuyt2017-07-181-2/+2
| | |/ / | |/| |
* | | | Update Prometheus gem to version that explicitly calls `munmap`Paweł Chojnacki2017-07-192-5/+12
| | | |
* | | | Merge branch 'rc/bump-peek-performance_bar' into 'master'Sean McGivern2017-07-191-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patch See merge request !12939
| * | | | Bump peek-performance_bar to 1.3.0 and get rid of a monkey-patchrc/bump-peek-performance_barRémy Coutable2017-07-181-4/+0
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'sh-structured-logging' into 'master'Sean McGivern2017-07-191-0/+21
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Add structured logging for Rails processes See merge request !12928
| * | | Add structured logging for Rails processessh-structured-loggingStan Hu2017-07-181-0/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces JSON logging for Rails views saved to a file called `development_json.log`, `production_json.log`, etc. For example, instead of this unparsable log: ``` Started GET "/" for 127.0.0.1 at 2012-03-10 14:28:14 +0100 Processing by HomeController#index as HTML Rendered text template within layouts/application (0.0ms) Rendered layouts/_assets.html.erb (2.0ms) Rendered layouts/_top.html.erb (2.6ms) Rendered layouts/_about.html.erb (0.3ms) Rendered layouts/_google_analytics.html.erb (0.4ms) Completed 200 OK in 79ms (Views: 78.8ms | ActiveRecord: 0.0ms) ``` We get a single line with this: ``` {"method":"GET","path":"/,"format":"html","controller":"HomeController","action":"index","status":200,"duration":79,"view":78.8,"db":0.0,"location":"http://localhost/","time":"2017-07-18 09:35:17 -0700"} ``` Part of #20060
* | | Merge branch 'rs-disable-test-log-in-ci' into 'master'Rémy Coutable2017-07-181-0/+5
|\ \ \ | |/ / |/| | | | | | | | Disable Rails logging in CI test environments See merge request !12847
| * | Disable Rails logging in CI test environmentsrs-disable-test-log-in-ciRobert Speicher2017-07-181-0/+5
| | | | | | | | | | | | See https://jtway.co/speed-up-your-rails-test-suite-by-6-in-1-line-13fedb869ec4
* | | Merge branch '34831-remove-coffee-rails-gem' into 'master'Jacob Schatz2017-07-171-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove coffee-rails gem Closes #34831 See merge request !12715
| * | | Remove .coffee ext files for i18nTakuya Noguchi2017-07-081-1/+0
| | | |
* | | | Fix incorrect AWS ELB metrics.35174-fix-aws-elb-queryJoshua Lambert2017-07-171-1/+1
| | | |
* | | | Merge branch 'bjk/metric_names' into 'master'Douwe Maan2017-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812
| * | | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_namesPawel Chojnacki2017-07-131-1/+1
| | |/ / | |/| | | | | | | | | | + fix tests after metrics rename
* | | | Refactor user bundleMike Greiling2017-07-141-1/+1
| | | |
* | | | Instrument Abilityinstrument-abilitySean McGivern2017-07-141-0/+4
| | | |
* | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master'Sean McGivern2017-07-141-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491
| * | | Fixes needed when GitLab sign-in is not enabledRobin Bobbitt2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When sign-in is disabled: - skip password expiration checks - prevent password reset requests - don’t show Password tab in User Settings - don’t allow login with username/password for Git over HTTP requests - render 404 on requests to Profiles::PasswordsController
* | | | Merge branch 'sh-disabled-prepared-statements-in-test' into 'master'Yorick Peterse2017-07-112-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Disabled prepared statements in test See merge request !12773
| * | | | Disabled prepared statements in testsh-disabled-prepared-statements-in-testStan Hu2017-07-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests may test migrations and change the types of columns. If this happens, Rails may cache a statement that will cause PostgreSQL to fail with the message, "cached plan must not change result type": https://github.com/rails/rails/issues/12330 This happened in https://gitlab.com/gitlab-org/gitlab-ee/issues/2890#note_34636077.
* | | | | Merge branch '33949-remove-healthcheck-access-token' into 'master'Sean McGivern2017-07-113-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the need to use health check token by adding ability to whitelist hosts Closes #33949 See merge request !12612
| * | | | | Merge prometheus unicorn sampler settigns within monitoring settingsPawel Chojnacki2017-07-053-11/+4
| | | | | |