Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Make the stubbed methods for SAML authorize paths more specificrs-platform-feature-spec-parity | Robert Speicher | 2018-06-19 | 1 | -2/+7 | |
* | | | | | | | | | | | Merge branch '6165-migrate-ee-specific-code' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -10/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Backport code from gitlab-ee!6182 | Lukas Eipert | 2018-06-20 | 2 | -10/+55 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'limit-metrics-content-type' into 'master' | Stan Hu | 2018-06-20 | 3 | -3/+22 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Limit the action suffixes in transaction metricslimit-metrics-content-type | Yorick Peterse | 2018-06-20 | 3 | -3/+22 | |
* | | | | | | | | | | | | Merge branch 'remove-allocations-gem' into 'master' | Stan Hu | 2018-06-20 | 8 | -29/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Remove remaining traces of the Allocations Gemremove-allocations-gem | Yorick Peterse | 2018-06-20 | 8 | -29/+5 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'highlight-cluster-settings-message' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -2/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Highlight cluster settings message | George Tsiolis | 2018-06-19 | 2 | -2/+8 | |
* | | | | | | | | | | | | Merge branch '48153-date-selection-dialog-broken-when-creating-a-new-mileston... | Rémy Coutable | 2018-06-20 | 2 | -2/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Prevent browser autocomplete for milestone date fields | Mark Fletcher | 2018-06-20 | 2 | -2/+7 | |
* | | | | | | | | | | | | Merge branch 'leipert-eslint-report-unused-directives' into 'master' | Mike Greiling | 2018-06-20 | 100 | -130/+105 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | ensure that `import/no-unresolved` does not trigger for our fixture filesleipert-eslint-report-unused-directives | Lukas Eipert | 2018-06-20 | 5 | -8/+4 | |
| * | | | | | | | | | | | | remove all unused eslint-disable rules | Lukas Eipert | 2018-06-20 | 94 | -120/+99 | |
| * | | | | | | | | | | | | report unused disabled eslint directives | Lukas Eipert | 2018-06-20 | 1 | -2/+2 | |
* | | | | | | | | | | | | | Merge branch 'revert-80044bda' into 'master' | Clement Ho | 2018-06-20 | 2 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Revert "Merge branch 'jivl-fix-focused-links-missing-underline' into 'master'" | Clement Ho | 2018-06-20 | 2 | -6/+0 | |
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'docs/48075-milestone-labels-can-be-confusing' into 'master'47964-custom-logo-rendering-improperly-on-sign-in-page | Mek Stittri | 2018-06-20 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Resolve conflicts with latest workflow label changes | Mek Stittri | 2018-06-20 | 138 | -804/+1210 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'bvl-errors-in-static-analysis' into 'master' | Sean McGivern | 2018-06-20 | 2 | -13/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | More verbose errors in static-analysis | Bob Van Landuyt | 2018-06-20 | 2 | -13/+30 | |
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'zj-can-be-merged' into 'master' | Douwe Maan | 2018-06-20 | 3 | -44/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Move mergablility check to Gitalyzj-can-be-merged | Zeger-Jan van de Weg | 2018-06-20 | 3 | -44/+21 | |
* | | | | | | | | | | | | | Merge branch 'fix/favicon-cross-origin' into 'master' | Douwe Maan | 2018-06-20 | 3 | -5/+35 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix: Serve favicon image always from the main GitLab domain to avoid issues w... | Alexis Reigel | 2018-06-20 | 3 | -5/+35 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch '47631-operations-kubernetes-option-is-always-visible-when-repos... | Rémy Coutable | 2018-06-20 | 3 | -0/+44 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Operations and Kubernetes items are now omitted in the sidebar when repositor...47631-operations-kubernetes-option-is-always-visible-when-repository-or-builds-are-disabled | Tiago Botelho | 2018-06-20 | 3 | -0/+44 | |
* | | | | | | | | | | | | | | Merge branch 'sh-bump-rugged-0.27.2' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Bump rugged to 0.27.2sh-bump-rugged-0.27.2 | Stan Hu | 2018-06-20 | 2 | -1/+6 | |
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'blackst0ne-rails5-found-new-routes-that-could-cause-conflicts-w... | Rémy Coutable | 2018-06-20 | 2 | -0/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | [Rails5] Fix ActionCable '/cable' mountpoint conflictblackst0ne-rails5-found-new-routes-that-could-cause-conflicts-with-existing-namespaced-routes | blackst0ne | 2018-06-20 | 2 | -0/+12 | |
* | | | | | | | | | | | | | | Merge branch 'docs/profile-preferences' into 'master' | Marcia Ramos | 2018-06-20 | 1 | -17/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Refactor the profile preferences docs | Achilleas Pipinellis | 2018-06-20 | 1 | -17/+9 | |
* | | | | | | | | | | | | | | | Merge branch 'docs-clarify-API-share-project-to-group' into 'master' | Achilleas Pipinellis | 2018-06-20 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Docs clarify API to share project to a groupdocs-clarify-API-share-project-to-group | Andrew Winata | 2018-06-01 | 2 | -1/+5 | |
* | | | | | | | | | | | | | | | Merge branch '48126-fix-prometheus-installation' into 'master' | Kamil Trzciński (Conference till 20th) | 2018-06-20 | 9 | -34/+59 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Resolve "Unable to install Prometheus on Clusters: 'Error: Chart incompatible... | Mayra Cabrera | 2018-06-20 | 9 | -34/+59 | |
|/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'docs/master-maintainer-note' into 'master' | Marcia Ramos | 2018-06-20 | 1 | -1/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add note about Master/Maintainer role | Achilleas Pipinellis | 2018-06-20 | 1 | -1/+13 | |
* | | | | | | | | | | | | | | Merge branch 'rails5-fix-48142' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Rails5 fix Admin::HooksController | Jasper Maes | 2018-06-20 | 2 | -1/+6 | |
* | | | | | | | | | | | | | | | Merge branch '48100-fix-branch-not-shown' into 'master' | Rémy Coutable | 2018-06-20 | 3 | -2/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | The json keys of ref switcher should not be translatedhiroponz/gitlab-ce-48100-fix-branch-not-shown | Hiroyuki Sato | 2018-06-20 | 3 | -2/+24 | |
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'clear-up-background-type-change-docs' into 'master' | Yorick Peterse | 2018-06-20 | 1 | -0/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Add docs for the cleanup step of a background column type changeclear-up-background-type-change-docs | Sean McGivern | 2018-06-19 | 1 | -0/+47 | |
* | | | | | | | | | | | | | | | Merge branch 'rails5-fix-48141' into 'master' | Rémy Coutable | 2018-06-20 | 2 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Rails5 fix expected: 0 times with any arguments received: 1 time with argume... | Jasper Maes | 2018-06-20 | 2 | -1/+7 | |
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'go-1.10-source-installs' into 'master' | Nick Thomas | 2018-06-20 | 2 | -11/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Use Go 1.10 for source installationsgo-1.10-source-installs | Jacob Vosmaer | 2018-06-19 | 2 | -11/+11 | |
* | | | | | | | | | | | | | | | | Merge branch 'use-backup-custom-hooks-gitaly' into 'master' | Douwe Maan | 2018-06-20 | 7 | -70/+119 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |