summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove confidential issue todos for project guestsfix-conf-issues-removeJarka Kadlecová2018-08-034-31/+104
* Merge branch '48834-chart-versions-for-applications-installed-by-one-click-in...Dmitriy Zaporozhets2018-08-0211-10/+130
|\
| * Lock helm charts to the VERSION already specified for each application.Thong Kuah2018-08-0211-10/+130
* | Merge branch 'fix/indentation-issue' into 'master'Rémy Coutable2018-08-021-2/+2
|\ \
| * | Fix indentation for artifacts example in docsAdam Liter2018-08-011-2/+2
* | | Merge branch '49830-use-helm-272' into 'master'Dmitriy Zaporozhets2018-08-023-2/+7
|\ \ \
| * | | Update Helm Tiller used by gitlab-managed-apps to 2.7.2Thong Kuah2018-08-023-2/+7
| | |/ | |/|
* | | Merge branch '44824-remove-ghost-notification-settings-for-group-and-project'...Sean McGivern2018-08-025-1/+73
|\ \ \
| * | | Resolve "Remove ghost notification settings for groups and projects"🙈 jacopo beschi 🙉2018-08-025-1/+73
|/ / /
* | | Merge branch 'update-gitlab-shell-to-8.1.0' into 'master'Nick Thomas2018-08-021-1/+1
|\ \ \
| * | | Update GITLAB_SHELL_VERSION to 8.1.0James Lopez2018-08-021-1/+1
| | |/ | |/|
* | | Merge branch 'patch-28' into 'master'Marcia Ramos2018-08-021-1/+1
|\ \ \
| * | | Update two_factor_authentication.mdJohn Burak2018-07-311-1/+1
* | | | Merge branch 'frozen-string-enable-app-models' into 'master'Rémy Coutable2018-08-02139-7/+286
|\ \ \ \
| * | | | Enable frozen string in app/models/*.rbrepo-forks/gitlab-ce-frozen-string-enable-app-modelsgfyoung2018-07-26139-7/+286
* | | | | Merge branch '48246-osw-load-diffs-improvement' into 'master'Sean McGivern2018-08-023-5/+15
|\ \ \ \ \
| * | | | | Only serializes diff files found by paths queryOswaldo Ferreira2018-08-013-5/+15
* | | | | | Merge branch '49851-link-to-runners' into 'master'Phil Hughes2018-08-023-2/+8
|\ \ \ \ \ \
| * | | | | | Automatically expand runner's settings block when linking to the runner's set...Filipa Lacerda2018-08-013-2/+8
* | | | | | | Merge branch 'gitaly-import-bare' into 'master'Sean McGivern2018-08-0224-80/+77
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Refactor gitlab:import:repos task to remove direct disk accessAlejandro Rodríguez2018-07-3124-80/+77
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'zj-repository-languages' into 'master'Nick Thomas2018-08-0129-4/+478
|\ \ \ \ \ \
| * | | | | | Add repository languages for projectsZeger-Jan van de Weg2018-08-0129-4/+478
* | | | | | | Merge branch 'backstage/avatar-helper-vanilla-js' into 'master'Clement Ho2018-08-019-45/+200
|\ \ \ \ \ \ \
| * | | | | | | Add vanilla JS avatar_helper and update existing avatar helpersPaul Slaughter2018-08-019-45/+200
|/ / / / / / /
* | | | | | | Merge branch '5488_license_management_backport_css' into 'master'Clement Ho2018-08-011-10/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | backport CSS from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6638Lukas Eipert2018-08-011-10/+6
* | | | | | | Merge branch '49837-fix-changelog' into 'master'Robert Speicher2018-08-011-12/+3
|\ \ \ \ \ \ \
| * | | | | | | Fixes changelog entries to reflect that 11.1.3 wasn't releasedFilipa Lacerda2018-08-011-12/+3
| |/ / / / / /
* | | | | | | Merge branch 'winh-raise-karma-timeout' into 'master'Tim Zallmann2018-08-011-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Raise timeout for Karma tests to 2 secondsWinnie Hellmann2018-08-011-1/+1
* | | | | | | | Merge branch 'rjh/pages-update-on-patch-version' into 'master'Rémy Coutable2018-08-011-3/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Added gitlab-pages update instructions.Richard Hancock2018-08-011-3/+13
|/ / / / / / /
* | | | | | | Merge branch 'fj-49802-bug-api-set-http-headers' into 'master'Nick Thomas2018-08-013-1/+40
|\ \ \ \ \ \ \
| * | | | | | | Fix bug setting http headers in Files APIFrancisco Javier López 🌴 On vacation; back on August 22th!2018-08-013-1/+40
|/ / / / / / /
* | | | | | | Merge branch '49499-list-of-projects-not-loading-when-trying-to-create-an-iss...Phil Hughes2018-08-014-1/+42
|\ \ \ \ \ \ \
| * | | | | | | Resolve "List of projects not loading when trying to create an issue from a b...Constance Okoghenun2018-08-014-1/+42
|/ / / / / / /
* | | | | | | Merge branch 'bvl-port-of-ee-translations' into 'master'Nick Thomas2018-08-0121-2647/+49957
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'master-i18n' into 'master'Nick Thomas2018-08-0121-2647/+49957
| |/ / / / /
* | | | | | Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-0166-18/+816
|\ \ \ \ \ \
| * | | | | | Add the message HTML to the UserStatus apiBob Van Landuyt2018-08-013-19/+39
| * | | | | | Regenerate locale/gitlab.potWinnie Hellmann2018-07-301-3/+3
| * | | | | | Make it explicit that the message can contain emojis in the settingsWinnie Hellmann2018-07-301-1/+1
| * | | | | | Make it explicit that the status message can contain emojisWinnie Hellmann2018-07-301-1/+1
| * | | | | | Hide the status fields behind a feature flagBob Van Landuyt2018-07-304-11/+44
| * | | | | | Show the status of a user in interactionsBob Van Landuyt2018-07-3043-15/+328
| * | | | | | Allow users to set a statusBob Van Landuyt2018-07-3021-6/+395
| * | | | | | Add the `UserStatus` modelBob Van Landuyt2018-07-253-0/+41
* | | | | | | Merge branch '41416-making-instance-wide-data-tools-more-accessible' into 'ma...Filipa Lacerda2018-08-0139-46/+315
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Correct the correction for application_setting.rbLuke Bennett2018-07-311-2/+2