| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Inline script cleanup globals and easy | Tim Zallmann | 2017-08-01 | 1 | -0/+5 |
| | | |||||
| * | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docs | Michael Kozono | 2017-07-31 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'inline-js-removal-projects-other' into 'master' | Phil Hughes | 2017-07-31 | 1 | -1/+4 |
| |\ | | | | | | | | | Inline js removal projects other See merge request !13075 | ||||
| | * | Converted Pipelines Charts | Tim Zallmann | 2017-07-27 | 1 | -0/+1 |
| | | | |||||
| | * | Moved Inline JS for Pipelines Charts + new Pipeline to dispatcher | Tim Zallmann | 2017-07-27 | 1 | -1/+2 |
| | | | |||||
| | * | Project New moved to external File | Tim Zallmann | 2017-07-27 | 1 | -0/+1 |
| | | | |||||
| * | | 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 |
| | |/ | |||||
| * | | Merge branch 'sh-augment-lograge-output' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+4 |
| |\ \ | | | | | | | | | | | | | Add remote IP, user ID and username to JSON lograge output See merge request !13147 | ||||
| | * \ | Merge branch 'master' into 'sh-augment-lograge-output' | Sean McGivern | 2017-07-28 | 1 | -4/+4 |
| | |\ \ | | | | | | | | | | | | | # Conflicts: # config/initializers/lograge.rb | ||||
| | * | | | 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 '35224-transform-user-profile-javascript-into-async-bundle' ↵ | Tim Zallmann | 2017-07-28 | 1 | -2/+0 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Transform user profile javascript into async bundle" Closes #35224 See merge request !12929 | ||||
| | * | | | refactor users bundle, remove inline javascript, and transform into an async ↵ | Mike Greiling | 2017-07-18 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | chunk | ||||
| * | | | | Merge branch 'sh-fix-lograge-exception' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix lograge exclusion in params section See merge request !13146 | ||||
| | * | | | | Fix lograge exclusion in params sectionsh-fix-lograge-exception | Stan Hu | 2017-07-28 | 1 | -1/+1 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this fix, we would just see redundant entries in the `params` section: ``` {"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":1.42,"view":0.38,"db":0.0,"time":"2017-07-28T02:59:18.167Z","params":{"controller":"metrics","action":"index"}} ``` The intended format looks more like this: ``` {"method":"GET","path":"/-/metrics","format":"html","controller":"MetricsController","action":"index","status":404,"duration":76.32,"view":69.95,"db":0.0,"time":"2017-07-28T02:59:48.893Z","params":{}} ``` The proper form to exclude an array is to preface with an asterisk: https://apidock.com/rails/Hash/except | ||||
| * | | | | Rename the metric groups35667-indicate-type-of-metric-for-prometheus-web-application-monitoring | Joshua Lambert | 2017-07-27 | 1 | -4/+4 |
| |/ / / | |||||
| * | | | 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 'pawel/prometheus_client_pid_reuse_error' into 'master' | Robert Speicher | 2017-07-27 | 1 | -0/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix prometheus client pid reuse bug See merge request !13130 | ||||
| | * | | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_error | Pawel Chojnacki | 2017-07-27 | 1 | -0/+4 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | unicorn forking new workers. | ||||
| * | | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 4 | -0/+30 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| | * | | | | fetch gpg signature badges by ajax | Alexis Reigel | 2017-07-27 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits. | ||||
| | * | | | | generate gpg signature on push | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | perform signature update in sidekiq worker | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | add profile gpg key page to manage gpg keys | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
| | |/ / / | |||||
| * | | | | 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 |
| | | | | | | |||||
| * | | | | | Mention how to test LDAP connections | Michael Kozono | 2017-07-26 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Update more examples | Michael Kozono | 2017-07-26 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Copy comment improvements from documentation | Michael Kozono | 2017-07-26 | 1 | -4/+11 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -1/+34 |
| |/ / / / | |||||
| * | | | | 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 | 2 | -1/+36 |
| |/ / / | |||||
| * | | | How to Merge to external File | Tim Zallmann | 2017-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch '35330-fix-nginx-add-haproxy' into 'master' | Tim Zallmann | 2017-07-24 | 1 | -1/+22 |
| |\ \ \ | | | | | | | | | | | | | | | | | Fix NGINX Error Rate query, include HA Proxy See merge request !13005 | ||||
| | * | | | Fix for HA Proxy | Joshua Lambert | 2017-07-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add HA Proxy metrics, fix NGINX | Joshua Lambert | 2017-07-20 | 1 | -1/+22 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |