Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove confidential issue todos for project guestsfix-conf-issues-remove | Jarka Kadlecová | 2018-08-03 | 4 | -31/+104 |
* | Merge branch '48834-chart-versions-for-applications-installed-by-one-click-in... | Dmitriy Zaporozhets | 2018-08-02 | 11 | -10/+130 |
|\ | |||||
| * | Lock helm charts to the VERSION already specified for each application. | Thong Kuah | 2018-08-02 | 11 | -10/+130 |
* | | Merge branch 'fix/indentation-issue' into 'master' | Rémy Coutable | 2018-08-02 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix indentation for artifacts example in docs | Adam Liter | 2018-08-01 | 1 | -2/+2 |
* | | | Merge branch '49830-use-helm-272' into 'master' | Dmitriy Zaporozhets | 2018-08-02 | 3 | -2/+7 |
|\ \ \ | |||||
| * | | | Update Helm Tiller used by gitlab-managed-apps to 2.7.2 | Thong Kuah | 2018-08-02 | 3 | -2/+7 |
| | |/ | |/| | |||||
* | | | Merge branch '44824-remove-ghost-notification-settings-for-group-and-project'... | Sean McGivern | 2018-08-02 | 5 | -1/+73 |
|\ \ \ | |||||
| * | | | Resolve "Remove ghost notification settings for groups and projects" | 🙈 jacopo beschi 🙉 | 2018-08-02 | 5 | -1/+73 |
|/ / / | |||||
* | | | Merge branch 'update-gitlab-shell-to-8.1.0' into 'master' | Nick Thomas | 2018-08-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update GITLAB_SHELL_VERSION to 8.1.0 | James Lopez | 2018-08-02 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'patch-28' into 'master' | Marcia Ramos | 2018-08-02 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update two_factor_authentication.md | John Burak | 2018-07-31 | 1 | -1/+1 |
* | | | | Merge branch 'frozen-string-enable-app-models' into 'master' | Rémy Coutable | 2018-08-02 | 139 | -7/+286 |
|\ \ \ \ | |||||
| * | | | | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-models | gfyoung | 2018-07-26 | 139 | -7/+286 |
* | | | | | Merge branch '48246-osw-load-diffs-improvement' into 'master' | Sean McGivern | 2018-08-02 | 3 | -5/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Only serializes diff files found by paths query | Oswaldo Ferreira | 2018-08-01 | 3 | -5/+15 |
* | | | | | | Merge branch '49851-link-to-runners' into 'master' | Phil Hughes | 2018-08-02 | 3 | -2/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Automatically expand runner's settings block when linking to the runner's set... | Filipa Lacerda | 2018-08-01 | 3 | -2/+8 |
* | | | | | | | Merge branch 'gitaly-import-bare' into 'master' | Sean McGivern | 2018-08-02 | 24 | -80/+77 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Refactor gitlab:import:repos task to remove direct disk access | Alejandro Rodríguez | 2018-07-31 | 24 | -80/+77 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'zj-repository-languages' into 'master' | Nick Thomas | 2018-08-01 | 29 | -4/+478 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add repository languages for projects | Zeger-Jan van de Weg | 2018-08-01 | 29 | -4/+478 |
* | | | | | | | Merge branch 'backstage/avatar-helper-vanilla-js' into 'master' | Clement Ho | 2018-08-01 | 9 | -45/+200 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add vanilla JS avatar_helper and update existing avatar helpers | Paul Slaughter | 2018-08-01 | 9 | -45/+200 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '5488_license_management_backport_css' into 'master' | Clement Ho | 2018-08-01 | 1 | -10/+6 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | backport CSS from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6638 | Lukas Eipert | 2018-08-01 | 1 | -10/+6 |
* | | | | | | | Merge branch '49837-fix-changelog' into 'master' | Robert Speicher | 2018-08-01 | 1 | -12/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixes changelog entries to reflect that 11.1.3 wasn't released | Filipa Lacerda | 2018-08-01 | 1 | -12/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'winh-raise-karma-timeout' into 'master' | Tim Zallmann | 2018-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Raise timeout for Karma tests to 2 seconds | Winnie Hellmann | 2018-08-01 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'rjh/pages-update-on-patch-version' into 'master' | Rémy Coutable | 2018-08-01 | 1 | -3/+13 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Added gitlab-pages update instructions. | Richard Hancock | 2018-08-01 | 1 | -3/+13 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fj-49802-bug-api-set-http-headers' into 'master' | Nick Thomas | 2018-08-01 | 3 | -1/+40 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix bug setting http headers in Files API | Francisco Javier López 🌴 On vacation; back on August 22th! | 2018-08-01 | 3 | -1/+40 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch '49499-list-of-projects-not-loading-when-trying-to-create-an-iss... | Phil Hughes | 2018-08-01 | 4 | -1/+42 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Resolve "List of projects not loading when trying to create an issue from a b... | Constance Okoghenun | 2018-08-01 | 4 | -1/+42 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master' | Nick Thomas | 2018-08-01 | 21 | -2647/+49957 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'master-i18n' into 'master' | Nick Thomas | 2018-08-01 | 21 | -2647/+49957 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'bvl-user-status-message-35463' into 'master' | Rémy Coutable | 2018-08-01 | 66 | -18/+816 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add the message HTML to the UserStatus api | Bob Van Landuyt | 2018-08-01 | 3 | -19/+39 |
| * | | | | | | Regenerate locale/gitlab.pot | Winnie Hellmann | 2018-07-30 | 1 | -3/+3 |
| * | | | | | | Make it explicit that the message can contain emojis in the settings | Winnie Hellmann | 2018-07-30 | 1 | -1/+1 |
| * | | | | | | Make it explicit that the status message can contain emojis | Winnie Hellmann | 2018-07-30 | 1 | -1/+1 |
| * | | | | | | Hide the status fields behind a feature flag | Bob Van Landuyt | 2018-07-30 | 4 | -11/+44 |
| * | | | | | | Show the status of a user in interactions | Bob Van Landuyt | 2018-07-30 | 43 | -15/+328 |
| * | | | | | | Allow users to set a status | Bob Van Landuyt | 2018-07-30 | 21 | -6/+395 |
| * | | | | | | Add the `UserStatus` model | Bob Van Landuyt | 2018-07-25 | 3 | -0/+41 |
* | | | | | | | Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'ma... | Filipa Lacerda | 2018-08-01 | 39 | -46/+315 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Correct the correction for application_setting.rb | Luke Bennett | 2018-07-31 | 1 | -2/+2 |