summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use last_commit instead of ref for loading signatureswinh-fix-blob-gpg-badgeWinnie Hellmann2018-08-021-1/+1
* Fix typo in blob_show_spec.rbWinnie Hellmann2018-08-021-1/+1
* Fix loading GPG status on blob pageWinnie Hellmann2018-08-022-1/+7
* Add failing test for https://gitlab.com/gitlab-org/gitlab-ce/issues/49831Winnie Hellmann2018-08-022-1/+11
* 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
| * | Correct application_setting.rb conflict mergeLuke Bennett2018-07-311-7/+2
| * | Merge branch 'master' into '41416-making-instance-wide-data-tools-more-access...Luke Bennett2018-07-31164-677/+2876
| |\ \
| * | | update gitlab.potLuke Bennett2018-07-311-0/+12
| * | | Merge remote-tracking branch 'origin/master' into 41416-making-instance-wide-...Luke Bennett2018-07-3045-178/+364
| |\ \ \
| * | | | missing i18n, the sequelLuke Bennett2018-07-302-7/+7
| * | | | missing i18nLuke Bennett2018-07-302-4/+4
| * | | | Add instance statistics settings to APIBob Van Landuyt2018-07-273-3/+10
| * | | | Update instance_statistics.html.hamlLuke Bennett2018-07-271-2/+2
| * | | | Update 41416-making-instance-wide-data-tools-more-accessible.ymlLuke Bennett2018-07-271-3/+2
| * | | | Remove instance statistics links from admin pagesBob Van Landuyt2018-07-271-10/+2
| * | | | Spec instance statisticsBob Van Landuyt2018-07-2711-15/+181
| * | | | correct instance statistics tooltipLuke Bennett2018-07-271-1/+1
| * | | | Move instance statistics icon left of admin wrenchLuke Bennett2018-07-271-6/+6
| * | | | Correct active page state for instance statisticsLuke Bennett2018-07-271-1/+1
| * | | | Add read_instance_statistics global policyLuke Bennett2018-07-274-10/+5
| * | | | Scope instance_statistics to dashLuke Bennett2018-07-272-2/+3
| * | | | schema.db updateLuke Bennett2018-07-271-0/+1