summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* I18N JS files starting with ujs-i18n-uBrandon Labuschagne2019-05-233-15/+50
| | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* Merge branch 'bvl-reenable-code-owners' into 'master'Douwe Maan2019-05-231-2/+2
|\ | | | | | | | | Re-enable codeowners See merge request gitlab-org/gitlab-ce!28585
| * Re-enable codeowners by moving the file backBob Van Landuyt2019-05-231-2/+2
| | | | | | | | And add myself as a ruby maintainer, since I forgot about that.
* | Merge branch '61049-links-activity-stream' into 'master'Phil Hughes2019-05-233-1/+11
|\ \ | | | | | | | | | | | | | | | | | | Use blue for activity stream links; use monospace font for commit sha Closes #61049 See merge request gitlab-org/gitlab-ce!28558
| * | Use blue for activity stream links; use monospace font for commit sha61049-links-activity-streamAnnabel Dunstone Gray2019-05-223-1/+11
| | |
* | | Merge branch '61393-emoji-button' into 'master'Filipa Lacerda2019-05-232-1/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change default color of award emoji button Closes #61393 See merge request gitlab-org/gitlab-ce!28556
| * | | Change default color of award emoji buttonAnnabel Dunstone Gray2019-05-222-1/+6
| | | |
* | | | Merge branch 'docs-adriel-add-namespace-pascal-case-note' into 'master'Filipa Lacerda2019-05-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add namespace PascalCase note to docs See merge request gitlab-org/gitlab-ce!28624
| * | | | Add namespace PascalCase note to docsAdriel Santiago2019-05-231-0/+1
|/ / / /
* | | | Merge branch 'update-groups-doc-grammar-typos-outdated' into 'master'Mike Lewis2019-05-221-106/+98
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Groups documentation See merge request gitlab-org/gitlab-ce!28508
| * | | | Replaced mdash with commaupdate-groups-doc-grammar-typos-outdatedChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-2/+6
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-3/+9
| | | | |
| * | | | Apply suggestion to doc/user/group/index.mdChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Removed "select", since the dropdown functions more like a modalChristie Lenneville2019-05-211-1/+1
| | | | |
| * | | | Update doc/user/group/index.md fileChristie Lenneville2019-05-211-107/+89
| | | | |
* | | | | Merge branch '13453_minimal_atom_fix' into 'master'Fatih Acet2019-05-222-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added a content field to atom feed See merge request gitlab-org/gitlab-ce!27652
| * | | | | Added a content field to atom feedDevin Sylva2019-05-222-0/+6
|/ / / / /
* | | | | Merge branch '60250-remove-mr_push_options-flag' into 'master'Stan Hu2019-05-224-18/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the mr_push_options feature flag Closes #60250 See merge request gitlab-org/gitlab-ce!28278
| * | | | | Add changelog entry60250-remove-mr_push_options-flagLuke Duncalfe2019-05-171-0/+5
| | | | | |
| * | | | | Remove the mr_push_options feature flagLuke Duncalfe2019-05-173-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Gitlab::QueryLimiting.whitelist` has been moved from being inside the feature flag conditional check to the `process_mr_push_options` `Api::Internal` helper. https://gitlab.com/gitlab-org/gitlab-ce/issues/60250
* | | | | | Merge branch 'adriel-reduce-complexity-earliest-datapoint' into 'master'Mike Greiling2019-05-221-8/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove datapoint sorting from area chart See merge request gitlab-org/gitlab-ce!26515
| * | | | | | Remove datapoint sorting from area chartAdriel Santiago2019-05-221-8/+8
|/ / / / / /
* | | | | | Merge branch 'jupyter_pre_spawn_hook_v2' into 'master'Dmitriy Zaporozhets2019-05-223-0/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | JupyterHub Repo Integration See merge request gitlab-org/gitlab-ce!27314
| * | | | | | JupyterHub Repo IntegrationAmit Rathi2019-05-223-0/+34
|/ / / / / /
* | | | | | Merge branch '61313-fix-dropdown-searchbar' into 'master'Fatih Acet2019-05-222-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix loading.. dropdown at search field Closes #61313 See merge request gitlab-org/gitlab-ce!28275
| * | | | | | Fix loading.. dropdown at search fieldPavel Chausov2019-05-222-0/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | Closes #61313
* | | | | | Merge branch 'sh-project-import-visibility-error' into 'master'Douglas Barbosa Alexandre2019-05-223-1/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix invalid visibility string comparison in project import Closes #61692 See merge request gitlab-org/gitlab-ce!28612
| * | | | | | Fix invalid visibility string comparison in project importStan Hu2019-05-223-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolves an "ArgumentError: comparison of String with 0 failed" issue where the visibility_level is stored as a string in the project import data because the value comes directly from the Web form. This problem happened upon creating a project from a template or restoring a project. We now cast the value to an integer to guard against these kinds of failures. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61692
* | | | | | | Merge branch ↵Douglas Barbosa Alexandre2019-05-223-1/+16
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contents' into 'master' Resolve "Performance issue: 502 errors on rendering of issues with heavy markdown contents" Closes #62116 See merge request gitlab-org/gitlab-ce!28597
| * | | | | | Fix page_description helper performance62116-performance-issue-502-errors-on-rendering-of-issues-with-heavy-markdown-contentsSean McGivern2019-05-223-1/+16
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helper is used for extracting part of the issue / MR / whatever description for use in the description meta tag: 1. To do that, we look at the source of the Markdown description. 2. We then strip out all HTML tags. 3. And then take the first 30 words. Doing that can be really slow - especially as Markdown is supposed to be treated as plain text. There are many better ways to do this, but the immediate performance fix is to swap steps 2 and 3. This does mean that the description may be less than 30 words (or even empty), but it is much faster when the description is very long.
* | | | | | Merge branch 'increase-ci-queue-histogram-buckets' into 'master'Kamil Trzciński2019-05-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 60s and 5m values to the buckets used by prometheus to measure time Closes #62113 See merge request gitlab-org/gitlab-ce!28557
| * | | | | | Add 60s & 5m monitor buckets for CI queuesElliot Rushton2019-05-221-1/+1
| | | | | | |
* | | | | | | Merge branch 'update-contribute-link' into 'master'Rémy Coutable2019-05-221-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect first Contribution link to about.gitlab.com/community/contribute See merge request gitlab-org/gitlab-ce!28245
| * | | | | | | Redirect first Contribution link to about.gitlab.com/community/contributeKenny Johnston2019-05-221-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'move-qa-and-package-to-review' into 'master'Rémy Coutable2019-05-221-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move package-and-qa to review stage from qa stage See merge request gitlab-org/gitlab-ce!28581
| * | | | | | | Move package-and-qa to review stage from qa stagemove-qa-and-package-to-reviewLin Jen-Shin2019-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way even if review-deploy failed we can still run it.
* | | | | | | | Merge branch 'link-to-issue-in-code-reuse-active-record-rubocop-rule' into ↵Yorick Peterse2019-05-222-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Link to issue in CodeReuse/ActiveRecord message See merge request gitlab-org/gitlab-ce!28461
| * | | | | | | | Link to issue in CodeReuse/ActiveRecord messagelink-to-issue-in-code-reuse-active-record-rubocop-ruleLuke Duncalfe2019-05-222-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides the user with some context as to why certain ActiveRecord methods are blacklisted.
* | | | | | | | | Merge branch 'patch-47' into 'master'Marcia Ramos2019-05-221-19/+20
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace passive with active voice See merge request gitlab-org/gitlab-ce!25780
| * | | | | | | | | replace passive with active voicePhilipp C. H2019-05-221-19/+20
|/ / / / / / / / /
* | | | | | | | | Merge branch '62061-note-icon-color' into 'master'Annabel Dunstone Gray2019-05-223-3/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update note actions icon color Closes #62061 See merge request gitlab-org/gitlab-ce!28498
| * | | | | | | | | Update note actions icon colorJarek Ostrowski2019-05-223-3/+8
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gray-600 for color Ensure passes accessibility reqs
* | | | | | | | | Merge branch 'graphql-tree' into 'master'Nick Thomas2019-05-2219-0/+318
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Added repository files to GraphQL API See merge request gitlab-org/gitlab-ce!28325
| * | | | | | | | Added repository files to GraphQL APIPhil Hughes2019-05-2219-0/+318
| | | | | | | | |
* | | | | | | | | Merge branch ↵Annabel Dunstone Gray2019-05-222-1/+6
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61324-non-project-snippet-new-snippet-button-should-be-green-outline' into 'master' Give 'New Snippet' button green outline Closes #61324 See merge request gitlab-org/gitlab-ce!28559
| * | | | | | | | Give 'New Snippet' button green outlineMarcel van Remmerden2019-05-222-1/+6
|/ / / / / / / /
View Lorry Controller Status