summaryrefslogtreecommitdiff
Commit message (Collapse)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 projects Closes #23931, #34671, #48647, and #47301 See merge request gitlab-org/gitlab-ce!19480
| * Add repository languages for projectsZeger-Jan van de Weg2018-08-0129-4/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our friends at GitHub show the programming languages for a long time, and inspired by that this commit means to create about the same functionality. Language detection is done through Linguist, as before, where the difference is that we cache the result in the database. Also, Gitaly can incrementaly scan a repository. This is done through a shell out, which creates overhead of about 3s each run. For now this won't be improved. Scans are triggered by pushed to the default branch, usually `master`. However, one exception to this rule the charts page. If we're requesting this expensive data anyway, we just cache it in the database. Edge cases where there is no repository, or its empty are caught in the Repository model. This makes use of Redis caching, which is probably already loaded. The added model is called RepositoryLanguage, which will make it harder if/when GitLab supports multiple repositories per project. However, for now I think this shouldn't be a concern. Also, Language could be confused with the i18n languages and felt like the current name was suiteable too. Design of the Project#Show page is done with help from @dimitrieh. This change is not visible to the end user unless detections are done.
* | Merge branch 'backstage/avatar-helper-vanilla-js' into 'master'Clement Ho2018-08-019-45/+200
|\ \ | | | | | | | | | | | | Add vanilla JS avatar_helper and update existing avatar helpers See merge request gitlab-org/gitlab-ce!20886
| * | 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 changes from gitlab-ee!6638 See merge request gitlab-org/gitlab-ce!20961
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clean up changelog for 11.1.3 and 11.1.4" Closes #49837 [ci skip] See merge request gitlab-org/gitlab-ce!20962
| * | | 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 seconds See merge request gitlab-org/gitlab-ce!20963
| * | | 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. See merge request gitlab-org/gitlab-ce!19674
| * | | 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 API See merge request gitlab-org/gitlab-ce!20938
| * | | Fix bug setting http headers in Files APIFrancisco Javier López 🌴 On vacation; back on August 22th!2018-08-013-1/+40
|/ / /
* | | Merge branch ↵Phil Hughes2018-08-014-1/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49499-list-of-projects-not-loading-when-trying-to-create-an-issue-from-a-board-typeerror' into 'master' Resolve "List of projects not loading when trying to create an issue from a board (TypeError)" Closes #49499 See merge request gitlab-org/gitlab-ce!20955
| * | | Resolve "List of projects not loading when trying to create an issue from a ↵Constance Okoghenun2018-08-014-1/+42
|/ / / | | | | | | | | | board (TypeError)"
* | | Merge branch 'bvl-port-of-ee-translations' into 'master'Nick Thomas2018-08-0121-2647/+49957
|\ \ \ | |/ / |/| | | | | | | | Port of EE-translations See merge request gitlab-org/gitlab-ce!20960
| * | Merge branch 'master-i18n' into 'master'Nick Thomas2018-08-0121-2647/+49957
| |/ | | | | | | | | New Crowdin translations See merge request gitlab-org/gitlab-ee!6706
* | Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-0166-18/+816
|\ \ | | | | | | | | | | | | | | | | | | Allow users to set a status Closes #35463 See merge request gitlab-org/gitlab-ce!20614
| * | 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
| | | | | | | | | | | | | | | Since the frontend for this feature isn't ready, better to hide the confusing field behind a feature flag.
| * | Show the status of a user in interactionsBob Van Landuyt2018-07-3043-15/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
| * | Allow users to set a statusBob Van Landuyt2018-07-3021-6/+395
| | | | | | | | | | | | | | | This can be done trough the API for the current user, or on the profile page.
| * | Add the `UserStatus` modelBob Van Landuyt2018-07-253-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This model will hold the status of a user, including these fields: - emoji: always present, with a default value - user: always present, foreign key to user - message: optional, maximum length of 100 The table also stores - cached_markdown_version - message_html For rendering markdown in the `message` field.
* | | Merge branch '41416-making-instance-wide-data-tools-more-accessible' into ↵Filipa Lacerda2018-08-0139-46/+315
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Resolve "Making instance-wide data tools more accessible" Closes #41416 and #48507 See merge request gitlab-org/gitlab-ce!20874
| * | 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 ↵Luke Bennett2018-07-31164-677/+2876
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | '41416-making-instance-wide-data-tools-more-accessible' # Conflicts: # app/models/application_setting.rb # lib/api/settings.rb
| * | | update gitlab.potLuke Bennett2018-07-311-0/+12
| | | |
| * | | Merge remote-tracking branch 'origin/master' into ↵Luke Bennett2018-07-3045-178/+364
| |\ \ \ | | | | | | | | | | | | | | | 41416-making-instance-wide-data-tools-more-accessible
| * | | | 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
| | | | |