summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Move import projects karma specs to jestLuke Bennett2019-04-258-242/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to the stability/validity of the specs.
* | | | | | | | | | Merge branch '60906-fix-wiki-links' into 'master'Stan Hu2019-04-253-3/+31
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wiki partial in search results Closes #60906 See merge request gitlab-org/gitlab-ce!27634
| * | | | | | | | | | Use wiki partial in search resultsMario de la Ossa2019-04-253-3/+31
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_sidekiq_init_file' into 'master'Stan Hu2019-04-251-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sidekiq initializer file See merge request gitlab-org/gitlab-ce!27684
| * | | | | | | | | | | Fix Sidekiq initializer fileValery Sizov2019-04-251-12/+12
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '10327-enable-reliable-fetcher-by-default' into 'master'Douglas Barbosa Alexandre2019-04-252-3/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Reliable fetcher by default Closes gitlab-ee#10327 See merge request gitlab-org/gitlab-ce!27530
| * | | | | | | | | | | Enable Reliable fetcher by defaultValery Sizov2019-04-252-3/+19
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'regen-command-docs' into 'master'Rémy Coutable2019-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve externalization.md PO regen docs See merge request gitlab-org/gitlab-ce!27669
| * | | | | | | | | | | Improve externalization.md PO regen docsLuke Bennett2019-04-251-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Instill confidence in gettext:regenerate command
* | | | | | | | | | | Merge branch 'patch-58' into 'master'Sean McGivern2019-04-252-2/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize left sidebar strings See merge request gitlab-org/gitlab-ce!27675
| * | | | | | | | | | | Externalize left sidebar stringsVictor Wu2019-04-252-2/+5
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '57017-add-toast-success-message' into 'master'Fatih Acet2019-04-257-26/+46
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry application upgrade > Success message (Add toast success message) Closes #57017 See merge request gitlab-org/gitlab-ce!27206
| * | | | | | | | | | | Implement toast componentJacques Erasmus2019-04-257-26/+46
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented the toast component for success messages
* | | | | | | | | | | Merge branch 'patch-56' into 'master'Sean McGivern2019-04-252-4/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Externalize strings in merge request tabs See merge request gitlab-org/gitlab-ce!27653
| * | | | | | | | | | | Externalize strings in merge request tabsVictor Wu2019-04-252-4/+7
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'refactor/58829-migrate-notes-spec-to-jest' into 'master'Phil Hughes2019-04-254-2/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor/58829 migrate notes spec to jest Closes #58829 See merge request gitlab-org/gitlab-ce!27648
| * | | | | | | | | | | test(Refactored notes tests from Karma to Jest):Martin Hobert2019-04-254-2/+7
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #58829 Added changelog entry Added merge request id
* | | | | | | | | | | Merge branch 'revert-4518806c' into 'master'Sean McGivern2019-04-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'patch-54' into 'master'" See merge request gitlab-org/gitlab-ce!27666
| * | | | | | | | | | | Revert "Merge branch 'patch-54' into 'master'"Victor Wu2019-04-251-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !27532
* | | | | | | | | | | Merge branch 'sh-fix-autocomplete-mirror-repo' into 'master'Filipa Lacerda2019-04-252-2/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable password autocomplete in mirror repository form Closes gitlab-ee#11237 See merge request gitlab-org/gitlab-ce!27542
| * | | | | | | | | | | Disable password autocomplete in mirror repository formsh-fix-autocomplete-mirror-repoStan Hu2019-04-212-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chrome and other browsers ignore `autocomplete=false` and `autocomplete=off` now. This likely caused the mirroring section to expand whenever a user clicked "Expand" in the protected branches settings. https://developers.google.com/web/fundamentals/design-and-ux/input/forms/?hl=en recommends using `new-password` as the new field to prevent automatic filling. This is similar to https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8477. Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11237
* | | | | | | | | | | | Merge branch 'project-home-panel-differences' into 'master'Filipa Lacerda2019-04-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix EE differences in home_panel.html.haml Closes gitlab-ee#11029 See merge request gitlab-org/gitlab-ce!27664
| * | | | | | | | | | | | Fix EE differences in home_panel.html.hamlPhil Hughes2019-04-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11029
* | | | | | | | | | | | | Merge branch '60953-broken-master' into 'master'Sean McGivern2019-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Broken master: ./spec/features/issuables/markdown_references/jira_spec.rb" Closes #60953 See merge request gitlab-org/gitlab-ce!27665
| * | | | | | | | | | | | Put a failing spec in quarantine60953-broken-masterRémy Coutable2019-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | Merge branch '11254-overflow-ce' into 'master'Kushal Pandya2019-04-252-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide ScopedBadge overflow notes See merge request gitlab-org/gitlab-ce!27651
| * | | | | | | | | | | | | Hide ScopedBadge overflow notesRajat Jain2019-04-252-1/+8
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch '48479-auto-direction-for-issue-title' into 'master'Annabel Dunstone Gray2019-04-2520-6/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "RTL Titles in issues are displayed Left-to-Right" Closes #48479 See merge request gitlab-org/gitlab-ce!27378
| * | | | | | | | | | | | Add auto direction to support rtl languagesAhmad Haghighi2019-04-2520-6/+29
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'improve-review-apps-jobs-structure' into 'master'Lin Jen-Shin2019-04-259-248/+283
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Organize better Review Apps and QA jobs See merge request gitlab-org/gitlab-ce!27509
| * | | | | | | | | | | | Update development Review Apps documentation with the latest changesRémy Coutable2019-04-242-80/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | Organize better Review Apps and QA jobsRémy Coutable2019-04-247-168/+201
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, play manual jobs once dependency jobs are done instead of polling for the dependent jobs to be finished. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'fix-new-issue-header' into 'master'Rémy Coutable2019-04-251-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix new issue header text See merge request gitlab-org/gitlab-ce!27662
| * | | | | | | | | | | Fix new issue header textSean McGivern2019-04-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the leading `=`, this is just interpreted as literal text, so it won't be translated.
* | | | | | | | | | | | Merge branch 'fix-lazy-blobs-requesting-all-previous-blobs' into 'master'Dmitriy Zaporozhets2019-04-253-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we only request blobs in one batch Closes #60829 See merge request gitlab-org/gitlab-ce!27625
| * | | | | | | | | | | | Ensure that we only request blobs in one batchSean McGivern2019-04-243-2/+23
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blob.lazy adds a blob to a batch to load at a later point, using the BatchLoader library. Whenever any lazy blob's attributes are accessed, all lazy blobs requested to that point will be loaded. BatchLoader, the library we use for this, should only request items in a batch once. That is, if we have these batches: 1. a, b, c 2. d, e, f Then a, b, and c should only be requested in the first batch. But if you modify the list of items in the batch, then the second batch will request a, b, c, d, e, f, which is almost certainly not what we want! https://github.com/exAspArk/batch-loader/issues/44 is the upstream issue for this, but we can also solve this in our application by not modifying the arguments we're using inside a BatchLoader batch.
* | | | | | | | | | | | Merge branch 'winh-typo-blob_spec' into 'master'Lin Jen-Shin2019-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in blob_spec.rb See merge request gitlab-org/gitlab-ce!27661
| * | | | | | | | | | | | Fix typo in blob_spec.rbWinnie Hellmann2019-04-251-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'get-rid-of-user-namespace-method' into 'master'Dmitriy Zaporozhets2019-04-253-16/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of the user_namespace API helper method See merge request gitlab-org/gitlab-ce!27636
| * | | | | | | | | | | | Get rid of the user_namespace API helper methodRémy Coutable2019-04-243-16/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch 'kp-add-base-url-support-graphql' into 'master'Phil Hughes2019-04-251-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for baseUrl in ApolloClient instance within GraphQL helper See merge request gitlab-org/gitlab-ce!27657
| * | | | | | | | | | | | Add support for baseUrl in ApolloClient instanceKushal Pandya2019-04-251-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for providing baseUrl/rootUrl within `uri` while creating ApolloClient instance.
* | | | | | | | | | | | | Merge branch '60552-period-dropdown' into 'master'Phil Hughes2019-04-253-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Autocomplete dropdown for usernames shows HTML if you attempt to search for a username that starts with a period" Closes #60552 See merge request gitlab-org/gitlab-ce!27533
| * | | | | | | | | | | | Escape special characters in GFM auto complete highlightingJan Beckmann2019-04-253-0/+47
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #60552
* | | | | | | | | | | | Merge branch 'jc-update-list-last-commits' into 'master'Lin Jen-Shin2019-04-254-2/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Client side changes for ListLastCommitsForTree response update See merge request gitlab-org/gitlab-ce!26880
| * | | | | | | | | | | | Update list_last_commits_for_tree response path field to path_bytesJohn Cai2019-04-244-2/+26
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the gitaly client to use path_bytes field instead of the deprecated path field in list_last_commits_for_tree_response. Also adds a test to guard against non-utf8 path data
* | | | | | | | | | | | Merge branch 'fj-53523-add-option-avoid-loading-wiki-page-content' into 'master'Stan Hu2019-04-2514-85/+188
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid loading Wiki Pages content when listed Closes #53523 See merge request gitlab-org/gitlab-ce!22801
| * | | | | | | | | | | | Added list_pages method to avoid loading all wiki pages contentFrancisco Javier López2019-04-2514-85/+188
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* | | | | | | | | | | | Merge branch '60687-enviro-dropdown' into 'master'Fatih Acet2019-04-244-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Metrics environments dropdown Closes #60687 See merge request gitlab-org/gitlab-ce!27586
| * | | | | | | | | | | | Fix Metrics environments dropdown60687-enviro-dropdownSimon Knox2019-04-244-2/+8
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also bring back EE dashboard component