Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'da-refactor-broadcast-message' into 'master' | Stan Hu | 2018-12-19 | 1 | -28/+9 |
|\ | |||||
| * | Refactor BroadcastMessage to use Gitlab::JsonCache | Douglas Barbosa Alexandre | 2018-12-19 | 1 | -28/+9 |
* | | Merge branch 'ce-reduce-deploy_keys_controller-diff-with-ce' into 'master' | Robert Speicher | 2018-12-19 | 2 | -2/+2 |
|\ \ | |||||
| * | | Make Projects::DeployKeysController EE-ready | Rémy Coutable | 2018-12-19 | 2 | -2/+2 |
| |/ | |||||
* | | Make LfsRequest EE-compatible | Rémy Coutable | 2018-12-19 | 1 | -0/+6 |
|/ | |||||
* | Merge branch 'zj-pool-destruction' into 'master' | Kamil Trzciński | 2018-12-19 | 5 | -3/+37 |
|\ | |||||
| * | Leave object pools when destroying projects | Zeger-Jan van de Weg | 2018-12-19 | 5 | -3/+37 |
* | | Merge branch 'osw-adjust-flaky-rails-logger-call' into 'master' | Rémy Coutable | 2018-12-19 | 1 | -1/+5 |
|\ \ | |||||
| * | | Adjust flaky Rails logger call test | Oswaldo Ferreira | 2018-12-18 | 1 | -1/+5 |
* | | | Merge branch '54146-fix-calendar-query' into 'master' | Grzegorz Bizon | 2018-12-19 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix calendar feed when sorted by priority | Heinrich Lee Yu | 2018-12-17 | 1 | -1/+1 |
* | | | | Merge branch 'issue-55534' into 'master' | Achilleas Pipinellis | 2018-12-19 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Fix typo: aunthenticator->authenticator | Erik Huelsmann | 2018-12-18 | 1 | -1/+1 |
| * | | | | Close #55534: link OTP auth less strictly to Google | Erik Huelsmann | 2018-12-18 | 1 | -1/+2 |
* | | | | | Merge branch 'ce-8810-fix-weight-sort' into 'master' | Sean McGivern | 2018-12-19 | 2 | -9/+11 |
|\ \ \ \ \ | |||||
| * | | | | | Backport of 8810-fix-weight-sort | Mario de la Ossa | 2018-12-18 | 2 | -9/+11 |
| |/ / / / | |||||
* | | | | | Merge branch 'port-missing-code-from-ee-in-group_policy' into 'master' | Douglas Barbosa Alexandre | 2018-12-18 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Add a missing policy allowance in GroupPolicy | Rémy Coutable | 2018-12-18 | 1 | -0/+1 |
* | | | | | Merge branch 'reduce-diff-with-ee-in-protected_refs_controller' into 'master' | Douwe Maan | 2018-12-18 | 3 | -2/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Reduce diff with EE in ProtectedRefsController | Rémy Coutable | 2018-12-17 | 3 | -2/+10 |
* | | | | | | Merge branch 'osw-revert-suggestions-ff' into 'master' | Douwe Maan | 2018-12-18 | 3 | -10/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove feature flag for suggest changes feature | Oswaldo Ferreira | 2018-12-18 | 3 | -10/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'force-reload-arguments-2' into 'master' | Rémy Coutable | 2018-12-18 | 1 | -6/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Passing an argument to force an association to reload is now deprecated | Jasper Maes | 2018-12-18 | 1 | -6/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Add explanatory help text to text inputs on user profile settings page | Martin Wortschack | 2018-12-18 | 6 | -21/+44 |
* | | | | | | Remove content disposition attachment displaying all ssh keys | Francisco Javier López | 2018-12-18 | 1 | -1/+0 |
* | | | | | | Merge branch 'ce-6635-extract-ee-specific-files-lines-for-app-controllers-adm... | Lin Jen-Shin | 2018-12-18 | 1 | -1/+7 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Make Admin::HealthCheckController EE-compatible | Rémy Coutable | 2018-12-17 | 1 | -1/+7 |
* | | | | | | Merge branch '41766-create-releases-page' into 'master' | Kamil Trzciński | 2018-12-18 | 8 | -33/+63 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Move Projects::ReleasesController under Tags | Alessio Caiazza | 2018-12-18 | 4 | -36/+45 |
| * | | | | | Adds releases index route | Filipa Lacerda | 2018-12-18 | 5 | -6/+27 |
* | | | | | | Merge branch 'reduce-imports_controller-diff-with-ce' into 'master' | Lin Jen-Shin | 2018-12-18 | 1 | -5/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make Projects::ImportsController EE-compatible | Rémy Coutable | 2018-12-17 | 1 | -5/+5 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch '51485-new-issue-labels-note' into 'master' | Rémy Coutable | 2018-12-18 | 2 | -10/+17 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Run CommonSystemNotesService on issuable create | Heinrich Lee Yu | 2018-12-18 | 2 | -10/+17 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'rs-except-deprecation' into 'master' | Sean McGivern | 2018-12-18 | 3 | -9/+12 |
|\ \ \ \ \ | |||||
| * | | | | | Change deprecated `except!` usages | Robert Speicher | 2018-12-16 | 3 | -9/+12 |
| |/ / / / | |||||
* | | | | | Merge branch 'bvl-hide-confidential-events-take2' into 'master' | Sean McGivern | 2018-12-18 | 2 | -13/+62 |
|\ \ \ \ \ | |||||
| * | | | | | Hide confidential events in ruby | Bob Van Landuyt | 2018-12-17 | 2 | -13/+62 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'fj-fix-action-name-jobscontroller' into 'master' | Rémy Coutable | 2018-12-18 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed action name in JobsController | Francisco Javier López | 2018-12-17 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Add "none" syntax highlighting "color" scheme | khm | 2018-12-18 | 4 | -2/+265 |
* | | | | | Add NGINX 0.16.0 and above metrics | Joshua Lambert | 2018-12-17 | 2 | -16/+23 |
* | | | | | Merge branch 'reduce-service-params-diff-with-ce' into 'master' | Robert Speicher | 2018-12-17 | 1 | -1/+5 |
|\ \ \ \ \ | |||||
| * | | | | | Use the EE version of ServiceParams | Rémy Coutable | 2018-12-17 | 1 | -1/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'avoid-wrapped-clone-button' into 'master' | Mike Greiling | 2018-12-17 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Re-align project title row and repo button containers | Andreas Kämmerle | 2018-12-14 | 1 | -2/+2 |
* | | | | | | Merge branch '53954-resolved-non-diff-discussions-on-merge-requests-no-longer... | Phil Hughes | 2018-12-17 | 3 | -11/+32 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Add message saying who resolved nondiff discussion | sbigelow | 2018-12-17 | 3 | -11/+32 |
| | |_|/ / | |/| | | | |||||
* | | | | | Add new predefined variable CI_COMMIT_SHORT_SHA | Jason Lenny | 2018-12-17 | 1 | -0/+1 |
| |_|/ / |/| | | |