Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '40781-os-to-ce' into 'master' | Sean McGivern | 2018-03-27 | 5 | -16/+10 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-22 | 200 | -750/+250 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into 40781-os-to-ce | Micaël Bergeron | 2018-03-08 | 81 | -0/+404 |
| |\ \ | |||||
| * | | | [cherry-pick] '4862-verify-file-checksums' | Sean McGivern | 2018-03-08 | 1 | -0/+5 |
| * | | | [ci-skip] add the CE changelog and remove the EE changelogs | Micaël Bergeron | 2018-03-07 | 11 | -51/+5 |
| * | | | Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 231 | -807/+358 |
| |\ \ \ | |||||
| * | | | | Merge branch '4915-background-upload-option-is-not-effective' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+5 |
| * | | | | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 52 | -0/+262 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backport | Kamil Trzciński | 2018-02-28 | 227 | -589/+3806 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge branch 'feature/sm/artifacts-trace-ee' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+5 |
| * | | | | | | Merge branch 'use-send-url-for-incompatible-runners' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+6 |
| * | | | | | | Merge branch '4163-move-uploads-to-object-storage' into 'master' | Sean McGivern | 2018-02-28 | 1 | -0/+5 |
| * | | | | | | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 227 | -570/+577 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'zj-auto-upload-job-artifacts' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+5 |
| * | | | | | | | Merge commit '7fabc892f251740dbd9a4755baede662e6854870' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 250 | -694/+577 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge commit 'f2f58a60b76acd479e37bdbc9246ec9f9b2bea82' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 307 | -848/+695 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge commit '11c67e7c2f992299ff5918ce67995b73d1e0be6d' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 320 | -734/+842 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Merge branch 'zj-improve-object-store-rake-task' into 'master' | Kamil Trzciński | 2018-02-28 | 1 | -0/+5 |
| * | | | | | | | | | | Merge branch 'jej/lfs-object-storage' into 'master' | Douwe Maan | 2018-02-28 | 1 | -0/+5 |
| * | | | | | | | | | | Merge commit 'b39d0c318921bae2e3a11df9ee6828291dad9864' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 285 | -567/+716 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit '5b08d59f07fc53c1e34819fac20352119d5343e6' into object-storage-e... | Kamil Trzciński | 2018-02-28 | 302 | -659/+574 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Merge branch 'zj-object-store-artifacts' into 'master' | Grzegorz Bizon | 2018-02-28 | 1 | -0/+4 |
* | | | | | | | | | | | | | Merge branch 'fix/ldap_wihtout_user' into 'master' | Douwe Maan | 2018-03-27 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix LDAP login without user in DB | Horatiu Eugen Vlad | 2018-03-27 | 1 | -0/+5 |
* | | | | | | | | | | | | | | Merge branch '43552-user-owned-projects-query-performance-improvement' into '... | Douwe Maan | 2018-03-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Improves User#owned_projects query performance | Tiago Botelho | 2018-03-26 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | Merge branch 'YarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-t... | Grzegorz Bizon | 2018-03-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Send notification emails when push to a merge requestYarNayar/gitlab-ce-23460-send-email-when-pushing-more-commits-to-the-merge-request | YarNayar | 2018-03-26 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | Bump `state_machines-activerecord` to `0.5.1` | blackst0ne | 2018-03-26 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | Merge branch '43316-controller-parameters-handling-sensitive-information-shou... | Kamil Trzciński | 2018-03-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Add CHANGELOG | Matija Čupić | 2018-03-17 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | Merge branch 'ab-43150-users-controller-show-query-limit' into 'master' | Yorick Peterse | 2018-03-26 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Remove N+1 query for Noteable association.ab-43150-users-controller-show-query-limit | Andreas Brandl | 2018-03-23 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | Resolve "Forking with namespace doesn't work (API)" | Jan | 2018-03-26 | 1 | -0/+5 |
| |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut... | Stan Hu | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Fix 500 error when trying to resolve non-ASCII conflicts in editor | Sean McGivern | 2018-03-23 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | Merge branch '44218-add-internationalization-support-for-the-prometheus-merge... | Filipa Lacerda | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Add i18n support for the mrWidget prometheus memory widget44218-add-internationalization-support-for-the-prometheus-merge-request-widget | Jose Ivan Vargas | 2018-03-23 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | Merge branch '44587-autolinking-includes-trailing-exclamation-marks' into 'ma... | Robert Speicher | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Add ?, !, and : to trailing puncutation excluded from auto-linking | Sean McGivern | 2018-03-23 | 1 | -0/+5 |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'pages_force_https' into 'master' | Nick Thomas | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Add HTTPS-only pages | Rob Watson | 2018-03-22 | 1 | -0/+5 |
| | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'sh-update-loofah' into 'master' | Robert Speicher | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Bump loofah to 2.2.2 and rails-html-sanitizer to 1.0.4sh-update-loofah | Stan Hu | 2018-03-22 | 1 | -0/+5 |
* | | | | | | | | | | | | | | | | | | | Merge branch '43525-limit-number-of-failed-logins-using-ldap' into 'master' | Douwe Maan | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Writes specs43525-limit-number-of-failed-logins-using-ldap | Tiago Botelho | 2018-03-22 | 1 | -0/+5 |
| | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Merge branch 'jprovazn-issueref' into 'master' | Douwe Maan | 2018-03-23 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | Fix issuable state indicator | Jan Provaznik | 2018-03-23 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | | | | | Merge branch '43771-improve-avatar-error-message' into 'master' | Sean McGivern | 2018-03-23 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Change avatar error message to include allowed file formats | Fabian Schneider | 2018-03-22 | 1 | -0/+5 |