Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into ide | Luke "Jared" Bennett | 2017-07-28 | 18 | -38/+188 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | 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 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 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' into 'sh-augment-lograge-output' | Sean McGivern | 2017-07-28 | 1 | -4/+4 | |
| | |\ \ \ | ||||||
| | * | | | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-output | Stan Hu | 2017-07-28 | 1 | -1/+4 | |
| * | | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into... | Tim Zallmann | 2017-07-28 | 1 | -2/+0 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | refactor users bundle, remove inline javascript, and transform into an async ... | Mike Greiling | 2017-07-18 | 1 | -2/+0 | |
| * | | | | | Merge branch 'sh-fix-lograge-exception' into 'master' | Sean McGivern | 2017-07-28 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fix lograge exclusion in params sectionsh-fix-lograge-exception | Stan Hu | 2017-07-28 | 1 | -1/+1 | |
| | | |/ / / | | |/| | | | ||||||
| * | | | | | 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 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 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 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Update prometheus client gem to fix problems with PID handling followingpawel/prometheus_client_pid_reuse_error | Pawel Chojnacki | 2017-07-27 | 1 | -0/+4 | |
| | | |_|_|/ / | | |/| | | | | ||||||
| * | | | | | | Merge branch 'feature/gpg-signed-commits' into 'master' | Dmitriy Zaporozhets | 2017-07-27 | 4 | -0/+30 | |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | 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 | |
| | * | | | | | 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 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | 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 | |
| |\ \ \ \ | ||||||
| | * | | | | 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 | |
| * | | | | | 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 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 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 | |
| * | | | | Merge branch 'zj-pipeline-badge-improvements' into 'master' | Grzegorz Bizon | 2017-07-22 | 1 | -1/+3 | |
| |\ \ \ \ | ||||||
| | * | | | | Rename build to pipeline for status badges | Z.J. van de Weg | 2017-07-21 | 1 | -1/+3 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge branch '31031-convert-protected-branches-es6' into 'master' | Filipa Lacerda | 2017-07-21 | 1 | -1/+1 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Update Protected Branches bundle path | kushalpandya | 2017-07-19 | 1 | -1/+1 | |
| * | | | | Merge branch 'sh-lograge-iso6801-time' into 'master' | Stan Hu | 2017-07-20 | 1 | -1/+1 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Standardize on ISO8601 UTC time for logragesh-lograge-iso6801-time | Stan Hu | 2017-07-20 | 1 | -1/+1 |