| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch '31207-clean-locked-merge-requests' into 'master' | Stan Hu | 2017-08-08 | 1 | -0/+4 |
|\ |
|
| * | Store MergeWorker JID on merge request, and clean up stuck merges | Oswaldo Ferreira | 2017-08-07 | 1 | -0/+4 |
* | | Merge branch '32844-issuables-performance' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+2 |
|\ \ |
|
| * | | Move some after_create parts to worker to improve performance32844-issuables-performance | Jarka Kadlecova | 2017-08-07 | 1 | -0/+2 |
* | | | Merge branch '33902-upgrade-to-webpack-v3' into 'master' | Jacob Schatz | 2017-08-07 | 2 | -7/+20 |
|\ \ \ |
|
| * | | | add thunky to approved licenses (MIT) | Mike Greiling | 2017-08-07 | 1 | -0/+6 |
| * | | | add disableHostCheck to devServer config since webpack dev server is proxied | Mike Greiling | 2017-08-07 | 1 | -0/+1 |
| * | | | replace stats-webpack-plugin with webpack-stats-plugin | Mike Greiling | 2017-08-07 | 1 | -7/+13 |
* | | | | Merge branch 'zj-project-templates' into 'master' | Sean McGivern | 2017-08-07 | 1 | -0/+1 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' into zj-project-templates | Filipa Lacerda | 2017-08-07 | 18 | -40/+178 |
| |\ \ \ \
| | |/ / / |
|
* | | | | | Merge branch 'group-milestone-references-system-notes' into 'master' | Robert Speicher | 2017-08-07 | 1 | -0/+4 |
|\ \ \ \ \ |
|
| * | | | | | Support references to group milestones | Sean McGivern | 2017-08-07 | 1 | -0/+4 |
| | |/ / /
| |/| | | |
|
* | | | | | Add sidekiq metrics endpoint and add http server to sidekiq | Paweł Chojnacki | 2017-08-07 | 3 | -0/+16 |
| |_|_|/
|/| | | |
|
* | | | | Merge branch 'master' into 'bvl-nfs-circuitbreaker' | Douwe Maan | 2017-08-07 | 2 | -3/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Fix issues with pdf-js dependencies | Mike Greiling | 2017-08-07 | 1 | -1/+4 |
| * | | | Backport to CE for:2902-standalone-ee-dir-ce | Lin Jen-Shin | 2017-08-04 | 1 | -2/+2 |
* | | | | 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 | 4 | -1/+40 |
|/ / / |
|
* | | | fix #3686 make tarball download url to end with extension | haseeb | 2017-08-03 | 1 | -1/+1 |
* | | | 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 |
|\ \ |
|
| * | | 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 Ca... | Rémy Coutable | 2017-07-28 | 1 | -1/+1 |
* | | | 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 |
| |/ / / / |
|