| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-cop | Rémy Coutable | 2017-08-09 | 1 | -1/+1 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Re-enable SqlInjection and CommandInjection | Brian Neel | 2017-08-08 | 1 | -2/+2 |
| | | |||||
| * | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | Resolve "Store MergeWorker JID on merge request, and clean up stuck merges" Closes #31207 See merge request !13207 | ||||
| | * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+4 |
| | | | |||||
| * | | Add sidekiq metrics endpoint and add http server to sidekiq | Paweł Chojnacki | 2017-08-07 | 2 | -0/+10 |
| |/ | |||||
| * | Move hostname to Gitlab::Environment | Bob Van Landuyt | 2017-08-04 | 1 | -1/+0 |
| | | |||||
| * | Add a Circuitbreaker for storage paths | Bob Van Landuyt | 2017-08-04 | 2 | -0/+28 |
| | | |||||
| * | Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵ | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
| | | | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master' | Douwe Maan | 2017-07-28 | 1 | -5/+8 |
| |\ | | | | | | | | | Backport some recent changes related to LDAP from EE See merge request !13119 | ||||
| | * | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checks | Rubén Dávila | 2017-07-27 | 1 | -5/+8 |
| | | | |||||
| * | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-output | Stan Hu | 2017-07-28 | 1 | -1/+4 |
| | | | | | | | | | This makes the logs a bit more useful to search requests by users. | ||||
| * | | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | Skip OAuth authorization for trusted applications See merge request !13061 | ||||
| | * | | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'remove_custom_devise_failure_app' into 'master' | Robert Speicher | 2017-07-27 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | Remove GitLab custom failure app for Devise See merge request !13136 | ||||
| | * | | | Remove GitLab custom fealure app for devise | Valery Sizov | 2017-07-27 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 1 | -0/+21 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546 | ||||
| | * | | | use Module#prepend instead of alias_method_chain | Alexis Reigel | 2017-07-27 | 1 | -16/+12 |
| | | | | | |||||
| | * | | | mysql hack: set length for binary indexes | Alexis Reigel | 2017-07-27 | 1 | -0/+25 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'pawel/ensure_temp_files_are_deleted_in_fs_metrics-35457' into ↵ | Douwe Maan | 2017-07-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensure test files are deleted after fs metrics gathering run Closes #35457 See merge request !13080 | ||||
| | * | | | Ensure test files are deleted after tests | Pawel Chojnacki | 2017-07-25 | 1 | -1/+1 |
| | | |/ | |/| | |||||
| * | | | Support custom directory in gitlab:backup:create task | Markus Koller | 2017-07-27 | 1 | -4/+0 |
| | |/ |/| | |||||
| * | | Merge branch '33601-add-csrf-token-verification-to-api' into 'master' | Sean McGivern | 2017-07-27 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Resolve "Add CSRF token verification to API" Closes #33601 See merge request !12154 | ||||
| | * | | Add `rescue false`. | blackst0ne | 2017-07-26 | 1 | -1/+1 |
| | | | | |||||
| | * | | Refactor CSRF protection | blackst0ne | 2017-07-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | Add warning about certificate verification on load | Michael Kozono | 2017-07-26 | 1 | -1/+10 |
| | | | | |||||
| * | | | Move backwards compatibility logic out of the code | Michael Kozono | 2017-07-26 | 1 | -1/+5 |
| | | | | | | | | | | | | | And closer to the configuration setup. The code doesn’t need to know about this. | ||||
| * | | | Add LDAP config options | Michael Kozono | 2017-07-26 | 1 | -0/+5 |
| |/ / | |||||
| * | | Merge branch 'add-instrumentation-to-link-to-gfm' into 'master' | Sean McGivern | 2017-07-25 | 1 | -0/+3 |
| |\ \ | | | | | | | | | | | | | Adds link_to_gfm method instrumentation See merge request !13069 | ||||
| | * | | Adds link_to_gfm method instrumentationadd-instrumentation-to-link-to-gfm | Tiago Botelho | 2017-07-25 | 1 | -0/+3 |
| | |/ | |||||
| * | | Resolve "More RESTful API: include resource URLs in responses" | Oswaldo Ferreira | 2017-07-25 | 1 | -0/+35 |
| |/ | |||||
| * | Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-time | Stan Hu | 2017-07-20 | 1 | -1/+1 |
| | | |||||
| * | Update Prometheus gem to version that explicitly calls `munmap` | Paweł Chojnacki | 2017-07-19 | 1 | -0/+12 |
| | | |||||
| * | Merge branch 'rc/bump-peek-performance_bar' into 'master' | Sean McGivern | 2017-07-19 | 1 | -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_bar | Rémy Coutable | 2017-07-18 | 1 | -4/+0 |
| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | Add structured logging for Rails processessh-structured-logging | Stan Hu | 2017-07-18 | 1 | -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 '34831-remove-coffee-rails-gem' into 'master' | Jacob Schatz | 2017-07-17 | 1 | -1/+0 |
| |\ | | | | | | | | | | | | | Remove coffee-rails gem Closes #34831 See merge request !12715 | ||||
| | * | Remove .coffee ext files for i18n | Takuya Noguchi | 2017-07-08 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'bjk/metric_names' into 'master' | Douwe Maan | 2017-07-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | Update metric names to match Prometheus guidelines. Closes #35031 See merge request !12812 | ||||
| | * | | Rename ConnectionRackMiddleware to RequestsRackMiddleware.bjk/metric_names | Pawel Chojnacki | 2017-07-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | + fix tests after metrics rename | ||||
| * | | | Instrument Abilityinstrument-ability | Sean McGivern | 2017-07-14 | 1 | -0/+4 |
| | | | | |||||
| * | | | Merge branch 'fixes-for-internal-auth-disabled' into 'master' | Sean McGivern | 2017-07-14 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | | | | | | | Fixes needed when GitLab sign-in is not enabled See merge request !12491 | ||||
| | * | | Fixes needed when GitLab sign-in is not enabled | Robin Bobbitt | 2017-07-13 | 1 | -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 '33949-remove-healthcheck-access-token' into 'master' | Sean McGivern | 2017-07-11 | 2 | -4/+5 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 settings | Pawel Chojnacki | 2017-07-05 | 2 | -7/+2 |
| | | | | | |||||
| | * | | | Add spaces between test phases | Pawel Chojnacki | 2017-07-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | + fix wrong test setup | ||||
| | * | | | correctly handle transforming settings into useful datastructure | Pawel Chojnacki | 2017-07-05 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Remove the need to use health check token | Pawel Chojnacki | 2017-07-05 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | | in favor of whitelist that will be used to control the access to monitoring resources | ||||
| * | | | | Support multiple Redis instances based on queue type | Paul Charlton | 2017-07-11 | 4 | -12/+17 |
| | | | | | |||||
| * | | | | Merge branch 'master' into 'catch-redis-address-error' | DJ Mountney | 2017-07-10 | 8 | -19/+33 |
| |\ \ \ \ | | |/ / | |/| | | | | | | # Conflicts: # lib/gitlab/current_settings.rb | ||||
| | * | | | Re-add Feature.register_feature_groups which is already documented | Rémy Coutable | 2017-07-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up for !12362 where this was documented but the code was removed in the last iteration. Since this can still be useful and this is already supported by the API, I think re-adding the code was the best course of action. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |