diff options
247 files changed, 585 insertions, 1053 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9fe10be3fef..87d73fc0c52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -155,12 +155,8 @@ stages: # Trigger a package build in omnibus-gitlab repository build-package: - image: ruby:2.3-alpine + image: ruby:2.4-alpine before_script: [] - services: [] - variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" stage: build cache: {} when: manual @@ -181,13 +177,9 @@ build-package: - apk add --update openssl - wget https://gitlab.com/gitlab-org/gitlab-ce/raw/master/scripts/trigger-build-docs - chmod 755 trigger-build-docs - services: [] cache: {} dependencies: [] - artifacts: {} variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" GIT_STRATEGY: none when: manual only: diff --git a/.rubocop.yml b/.rubocop.yml index dbeb1880d39..c427f219a0d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -624,7 +624,7 @@ Style/PredicateName: # branches, and conditions. Metrics/AbcSize: Enabled: true - Max: 55.25 + Max: 54.28 # This cop checks if the length of a block exceeds some maximum value. Metrics/BlockLength: @@ -665,7 +665,7 @@ Metrics/ParameterLists: # A complexity metric geared towards measuring complexity for a human reader. Metrics/PerceivedComplexity: Enabled: true - Max: 15 + Max: 14 # Lint ######################################################################## diff --git a/CHANGELOG.md b/CHANGELOG.md index c857efddb15..578651639c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,198 @@ documentation](doc/development/changelog.md) for instructions on adding your own entry. +## 10.1.0 (2017-10-22) + +- [SECURITY] Use a timeout on certain git operations. !14872 +- [SECURITY] Move project repositories between namespaces when renaming users. +- [SECURITY] Prevent an open redirect on project pages. +- [SECURITY] Prevent a persistent XSS in user-provided markup. +- [REMOVED] Remove the ability to visit the issue edit form directly. !14523 +- [REMOVED] Remove animate.js and label animation. +- [FIXED] Perform prometheus data endpoint requests in parallel. !14003 +- [FIXED] Escape quotes in git username. !14020 (Brandon Everett) +- [FIXED] Fixed non-UTF-8 valid branch names from causing an error. !14090 +- [FIXED] Read import sources from setting at first initialization. !14141 (Visay Keo) +- [FIXED] Display full pre-receive and post-receive hook output in GitLab UI. !14222 (Robin Bobbitt) +- [FIXED] Fix incorrect X-axis labels in Prometheus graphs. !14258 +- [FIXED] Fix the default branches sorting to actually be 'Last updated'. !14295 +- [FIXED] Fixes project denial of service via gitmodules using Extended ASCII. !14301 +- [FIXED] Fix the filesystem shard health check to check all configured shards. !14341 +- [FIXED] Compare email addresses case insensitively when verifying GPG signatures. !14376 (Tim Bishop) +- [FIXED] Allow the git circuit breaker to correctly handle missing repository storages. !14417 +- [FIXED] Fix `rake gitlab:incoming_email:check` and make it report the actual error. !14423 +- [FIXED] Does not check if an invariant hashed storage path exists on disk when renaming projects. !14428 +- [FIXED] Also reserve refs/replace after importing a project. !14436 +- [FIXED] Fix profile image orientation based on EXIF data gvieira37. !14461 (gvieira37) +- [FIXED] Move the deployment flag content to the left when deployment marker is near the end. !14514 +- [FIXED] Fix notes type created from import. This should fix some missing notes issues from imported projects. !14524 +- [FIXED] Fix bottom spacing for dropdowns that open upwards. !14535 +- [FIXED] Adjusts tag link to avoid underlining spaces. !14544 (Guilherme Vieira) +- [FIXED] Add missing space in Sidekiq memory killer log message. !14553 (Benjamin Drung) +- [FIXED] Ensure no exception is raised when Raven tries to get the current user in API context. !14580 +- [FIXED] Fix edit project service cancel button position. !14596 (Matt Coleman) +- [FIXED] Fix case sensitive email confirmation on signup. !14606 (robdel12) +- [FIXED] Whitelist authorized_keys.lock in the gitlab:check rake task. !14624 +- [FIXED] Allow merge in MR widget with no pipeline but using "Only allow merge requests to be merged if the pipeline succeeds". !14633 +- [FIXED] Fix navigation dropdown close animation on mobile screens. !14649 +- [FIXED] Fix the project import with issues and milestones. !14657 +- [FIXED] Use explicit boolean true attribute for show-disabled-button in Vue files. !14672 +- [FIXED] Make tabs on top scrollable on admin dashboard. !14685 (Takuya Noguchi) +- [FIXED] Fix broken Y-axis scaling in some Prometheus graphs. !14693 +- [FIXED] Search or compare LDAP DNs case-insensitively and ignore excess whitespace. !14697 +- [FIXED] Allow prometheus graphs to correctly handle NaN values. !14741 +- [FIXED] Don't show an "Unsubscribe" link in snippet comment notifications. !14764 +- [FIXED] Fixed duplicate notifications when added multiple labels on an issue. !14798 +- [FIXED] Fix alignment for indeterminate marker in dropdowns. !14809 +- [FIXED] Fix error when updating a forked project with deleted `ForkedProjectLink`. !14916 +- [FIXED] Correctly render asset path for locales with a region. !14924 +- [FIXED] Fix the external URLs generated for online view of HTML artifacts. !14977 +- [FIXED] Reschedule merge request diff background migrations to catch failures from 9.5 run. +- [FIXED] fix merge request widget status icon for failed CI. +- [FIXED] Fix the number representing the amount of commits related to a push event. +- [FIXED] Sync up hover and legend data across all graphs for the prometheus dashboard. +- [FIXED] Fixes mini pipeline graph in commit view. +- [FIXED] Fix comment deletion confirmation dialog typo. +- [FIXED] Fix project snippets breadcrumb link. +- [FIXED] Make usage ping scheduling more robust. +- [FIXED] Make "merge ongoing" check more consistent. +- [FIXED] Add 1000+ counters to job page. +- [FIXED] Fixed issue/merge request breadcrumb titles not having links. +- [FIXED] Fixed commit avatars being centered vertically. +- [FIXED] Tooltips in the commit info box now all face the same direction. (Jedidiah Broadbent) +- [FIXED] Fixed navbar title colors leaking out of the navbar. +- [FIXED] Fix bug that caused merge requests with diff notes imported from Bitbucket to raise errors. +- [FIXED] Correctly detect multiple issue URLs after 'Closes...' in MR descriptions. +- [FIXED] Set default scope on PATs that don't have one set to allow them to be revoked. +- [FIXED] Fix application setting to cache nil object. +- [FIXED] Fix image diff swipe handle offset to correctly align with the frame. +- [FIXED] Force non diff resolved discussion to display when collapse toggled. +- [FIXED] Fix resolved discussions not expanding on side by side view. +- [FIXED] Fixed the sidebar scrollbar overlapping links. +- [FIXED] Issue board tooltips are now the correct width when the column is collapsed. (Jedidiah Broadbent) +- [FIXED] Improve autodevops banner UX and render it only in project page. +- [FIXED] Fix typo in cycle analytics breaking time component. +- [FIXED] Force two up view to load by default for image diffs. +- [FIXED] Fixed milestone breadcrumb links. +- [FIXED] Fixed group sort dropdown defaulting to empty. +- [FIXED] Fixed notes not being scrolled to in merge requests. +- [FIXED] Adds Event polyfill for IE11. +- [FIXED] Update native unicode emojis to always render as normal text (previously could render italicized). (Branka Martinovic) +- [FIXED] Sort JobsController by id, not created_at. +- [FIXED] Fix revision and total size missing for Container Registry. +- [FIXED] Fixed milestone issuable assignee link URL. +- [FIXED] Fixed breadcrumbs container expanding in side-by-side diff view. +- [FIXED] Fixed merge request widget merged & closed date tooltip text. +- [FIXED] Prevent creating multiple ApplicationSetting instances. +- [FIXED] Fix username and ID not logging in production_json.log for Git activity. +- [FIXED] Make Redcarpet Markdown renderer thread-safe. +- [FIXED] Two factor auth messages in settings no longer overlap the button. (Jedidiah Broadbent) +- [FIXED] Made the "remember me" check boxes have consistent styles and alignment. (Jedidiah Broadbent) +- [FIXED] Prevent branches or tags from starting with invalid characters (e.g. -, .). +- [DEPRECATED] Removed two legacy config options. (Daniel Voogsgerd) +- [CHANGED] Show notes number more user-friendly in the graph. !13949 (Vladislav Kaverin) +- [CHANGED] Link SAML users to LDAP by email. !14216 +- [CHANGED] Display whether branch has been merged when deleting protected branch. !14220 +- [CHANGED] Make the labels in the Compare form less confusing. !14225 +- [CHANGED] Confirmation email shows link as text instead of human readable text. !14243 (bitsapien) +- [CHANGED] Return only group's members in user dropdowns on issuables list pages. !14249 +- [CHANGED] Added defaults for protected branches dropdowns on the repository settings. !14278 +- [CHANGED] Show confirmation modal before deleting account. !14360 +- [CHANGED] Allow creating merge requests across a fork network. !14422 +- [CHANGED] Re-arrange <script> tags before <template> tags in .vue files. !14671 +- [CHANGED] Create idea of read-only database. !14688 +- [CHANGED] Add active states to nav bar counters. +- [CHANGED] Add view replaced file link for image diffs. +- [CHANGED] Adjust tooltips to adhere to 8px grid and make them more readable. +- [CHANGED] breadcrumbs receives padding when double lined. +- [CHANGED] Allow developer role to admin milestones. +- [CHANGED] Stop using Sidekiq for updating Key#last_used_at. +- [CHANGED] Include GitLab full name in Slack messages. +- [ADDED] Expose last pipeline details in API response when getting a single commit. !13521 (Mehdi Lahmam (@mehlah)) +- [ADDED] Allow to use same periods for different housekeeping tasks (effectively skipping the lesser task). !13711 (cernvcs) +- [ADDED] Add GitLab-Pages version to Admin Dashboard. !14040 (travismiller) +- [ADDED] Commenting on image diffs. !14061 +- [ADDED] Script to migrate project's repositories to new Hashed Storage. !14067 +- [ADDED] Hide close MR button after merge without reloading page. !14122 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Add Gitaly version to Admin Dashboard. !14313 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Add 'closed_at' attribute to Issues API. !14316 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Add tooltip for milestone due date to issue and merge request lists. !14318 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Improve list of sorting options. !14320 (Vitaliy @blackst0ne Klachkov) +- [ADDED] Add client and call site metadata to Gitaly calls for better traceability. !14332 +- [ADDED] Strip gitlab-runner section markers in build trace HTML view. !14393 +- [ADDED] Add online view of HTML artifacts for public projects. !14399 +- [ADDED] Create Kubernetes cluster on GKE from k8s service. !14470 +- [ADDED] Add support for GPG subkeys in signature verification. !14517 +- [ADDED] Parse and store gitlab-runner timestamped section markers. !14551 +- [ADDED] Add "implements" to the default issue closing message regex. !14612 (Guilherme Vieira) +- [ADDED] Replace `tag: true` into `:tag` in the specs. !14653 (Jacopo Beschi @jacopo-beschi) +- [ADDED] Discussion lock for issues and merge requests. +- [ADDED] Add an API endpoint to determine the forks of a project. +- [ADDED] Add help text to runner edit: tags should be separated by commas. (Brendan O'Leary) +- [ADDED] Only copy old/new code when selecting left/right side of parallel diff. +- [ADDED] Expose avatar_url when requesting list of projects from API with simple=true. +- [ADDED] A confirmation email is now sent when adding a secondary email address. (digitalmoksha) +- [ADDED] Move Custom merge methods from EE. +- [ADDED] Makes @mentions links have a different styling for better separation. +- [ADDED] Added tabs to dashboard/projects to easily switch to personal projects. +- [OTHER] Extract AutocompleteController#users into finder. !13778 (Maxim Rydkin, Mayra Cabrera) +- [OTHER] Replace 'project/wiki.feature' spinach test with an rspec analog. !13856 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Expand docs for changing username or group path. !13914 +- [OTHER] Move `lib/ci` to `lib/gitlab/ci`. !14078 (Maxim Rydkin) +- [OTHER] Decrease Cyclomatic Complexity threshold to 13. !14152 (Maxim Rydkin) +- [OTHER] Decrease Perceived Complexity threshold to 15. !14160 (Maxim Rydkin) +- [OTHER] Replace project/group_links.feature spinach test with an rspec analog. !14169 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the project/milestone.feature spinach test with an rspec analog. !14171 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the profile/emails.feature spinach test with an rspec analog. !14172 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the project/team_management.feature spinach test with an rspec analog. !14173 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog. !14176 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/builds/summary.feature' spinach test with an rspec analog. !14177 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Optimize the boards' issues fetching. !14198 +- [OTHER] Replace the 'project/merge_requests/revert.feature' spinach test with an rspec analog. !14201 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog. !14202 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'profile/active_tab.feature' spinach test with an rspec analog. !14239 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'search.feature' spinach test with an rspec analog. !14248 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Load sidebar participants avatars only when visible. !14270 +- [OTHER] Adds gitlab features and components to usage ping data. !14305 +- [OTHER] Replace the 'project/archived.feature' spinach test with an rspec analog. !14322 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/commits/revert.feature' spinach test with an rspec analog. !14325 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/snippets.feature' spinach test with an rspec analog. !14326 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Add link to OpenID Connect documentation. !14368 (Markus Koller) +- [OTHER] Upgrade doorkeeper-openid_connect. !14372 (Markus Koller) +- [OTHER] Upgrade gitlab-markup gem. !14395 (Markus Koller) +- [OTHER] Index projects on repository storage. !14414 +- [OTHER] Replace the 'project/shortcuts.feature' spinach test with an rspec analog. !14431 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Replace the 'project/service.feature' spinach test with an rspec analog. !14432 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Improve GitHub import performance. !14445 +- [OTHER] Add basic sprintf implementation to JavaScript. !14506 +- [OTHER] Replace the 'project/merge_requests.feature' spinach test with an rspec analog. !14621 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Update GitLab Pages to v0.6.0. !14630 +- [OTHER] Add documentation to summarise project archiving. !14650 +- [OTHER] Remove 'Repo' prefix from API entites. !14694 (Vitaliy @blackst0ne Klachkov) +- [OTHER] Removes cycle analytics service and store from global namespace. +- [OTHER] Improves i18n for Auto Devops callout. +- [OTHER] Exports common_utils utility functions as modules. +- [OTHER] Use `simple=true` for projects API in Projects dropdown for better search performance. +- [OTHER] Change index on ci_builds to optimize Jobs Controller. +- [OTHER] Add index for merge_requests.merge_commit_sha. +- [OTHER] Add (partial) index on Labels.template. +- [OTHER] Cache issue and MR template names in Redis. +- [OTHER] changed dashed border button color to be darker. +- [OTHER] Speed up permission checks. +- [OTHER] Fix docs for lightweight tag creation via API. +- [OTHER] Clarify artifact download via the API only accepts branch or tag name for ref. +- [OTHER] Change recommended MySQL version to 5.6. +- [OTHER] Bump google-api-client Gem from 0.8.6 to 0.13.6. +- [OTHER] Detect when changelog entries are invalid. +- [OTHER] Use a UNION ALL for getting merge request notes. +- [OTHER] Remove an index on ci_builds meant to be only temporary. +- [OTHER] Remove a SQL query from the todos index page. +- Support custom attributes on users. !13038 (Markus Koller) +- made read-only APIs for public merge requests available without authentication. !13291 (haseebeqx) +- Hide read_registry scope when registry is disabled on instance. !13314 (Robin Bobbitt) +- creation of keys moved to services. !13331 (haseebeqx) +- Add username as GL_USERNAME in hooks. + ## 10.0.4 (2017-10-16) - [SECURITY] Move project repositories between namespaces when renaming users. diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION index a758a09aae5..fbaaafa001b 100644 --- a/GITALY_SERVER_VERSION +++ b/GITALY_SERVER_VERSION @@ -1 +1 @@ -0.48.0 +0.49.0
\ No newline at end of file @@ -102,7 +102,7 @@ gem 'fog-google', '~> 0.5' gem 'fog-local', '~> 0.3' gem 'fog-openstack', '~> 0.1' gem 'fog-rackspace', '~> 0.1.1' -gem 'fog-aliyun', '~> 0.1.0' +gem 'fog-aliyun', '~> 0.2.0' # for Google storage gem 'google-api-client', '~> 0.13.6' diff --git a/Gemfile.lock b/Gemfile.lock index 27a76dc36cb..601d5ca16e2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -214,7 +214,7 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aliyun (0.1.0) + fog-aliyun (0.2.0) fog-core (~> 1.27) fog-json (~> 1.0) ipaddress (~> 0.8) @@ -1015,7 +1015,7 @@ DEPENDENCIES flay (~> 2.8.0) flipper (~> 0.10.2) flipper-active_record (~> 0.10.2) - fog-aliyun (~> 0.1.0) + fog-aliyun (~> 0.2.0) fog-aws (~> 1.4) fog-core (~> 1.44) fog-google (~> 0.5) diff --git a/MAINTENANCE.md b/MAINTENANCE.md index 1efb2a35f6d..5cf9fee1a14 100644 --- a/MAINTENANCE.md +++ b/MAINTENANCE.md @@ -1,35 +1,3 @@ # GitLab Maintenance Policy -GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: -`(Major).(Minor).(Patch)` in a [pragmatic way]. - -- **Major version**: Whenever there is something significant or any backwards - incompatible changes are introduced to the public API. -- **Minor version**: When new, backwards compatible functionality is introduced - to the public API or a minor feature is introduced, or when a set of smaller - features is rolled out. -- **Patch number**: When backwards compatible bug fixes are introduced that fix - incorrect behavior. - -The current stable release will receive security patches and bug fixes -(eg. `8.9.0` -> `8.9.1`). Feature releases will mark the next supported stable -release where the minor version is increased numerically by increments of one -(eg. `8.9 -> 8.10`). - -Our current policy is to support one stable release at any given time, but for -medium-level security issues, we may consider [backporting to the previous two -monthly releases][rel-sec]. - -We encourage everyone to run the latest stable release to ensure that you can -easily upgrade to the most secure and feature-rich GitLab experience. In order -to make sure you can easily run the most recent stable release, we are working -hard to keep the update process simple and reliable. - -More information about the release procedures can be found in our -[release-tools documentation][rel]. You may also want to read our -[Responsible Disclosure Policy][disclosure]. - -[rel-sec]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/security.md#backporting -[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ -[disclosure]: https://about.gitlab.com/disclosure/ -[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e +See [doc/policy/maintenance.md](doc/policy/maintenance.md) @@ -1 +1 @@ -10.1.0-pre +10.2.0-pre diff --git a/app/assets/javascripts/issue_show/components/fields/title.vue b/app/assets/javascripts/issue_show/components/fields/title.vue index 83af8e1e245..c3abb9fd9d5 100644 --- a/app/assets/javascripts/issue_show/components/fields/title.vue +++ b/app/assets/javascripts/issue_show/components/fields/title.vue @@ -16,15 +16,15 @@ <fieldset> <label class="sr-only" - for="issue-title"> + for="issuable-title"> Title </label> <input - id="issue-title" + id="issuable-title" class="form-control" type="text" - placeholder="Issue title" - aria-label="Issue title" + placeholder="Title" + aria-label="Title" v-model="formState.title" @keydown.meta.enter="updateIssuable" @keydown.ctrl.enter="updateIssuable" /> diff --git a/app/assets/javascripts/registry/stores/actions.js b/app/assets/javascripts/registry/stores/actions.js index 34ed40b8b65..795b39bb3dc 100644 --- a/app/assets/javascripts/registry/stores/actions.js +++ b/app/assets/javascripts/registry/stores/actions.js @@ -29,11 +29,9 @@ export const fetchList = ({ commit }, { repo, page }) => { }); }; -export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath) - .then(res => res.json()); +export const deleteRepo = ({ commit }, repo) => Vue.http.delete(repo.destroyPath); -export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath) - .then(res => res.json()); +export const deleteRegistry = ({ commit }, image) => Vue.http.delete(image.destroyPath); export const setMainEndpoint = ({ commit }, data) => commit(types.SET_MAIN_ENDPOINT, data); export const toggleLoading = ({ commit }) => commit(types.TOGGLE_MAIN_LOADING); diff --git a/app/assets/javascripts/repo/components/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue index c7e69340f17..8c86e87ed3a 100644 --- a/app/assets/javascripts/repo/components/repo_file.vue +++ b/app/assets/javascripts/repo/components/repo_file.vue @@ -28,6 +28,9 @@ marginLeft: `${this.file.level * 16}px`, }; }, + shortId() { + return this.file.id.substr(0, 8); + }, }, methods: { linkClicked(file) { @@ -55,6 +58,17 @@ > {{ file.name }} </a> + <template v-if="file.type === 'submodule' && file.id"> + @ + <span class="commit-sha"> + <a + @click.stop + :href="file.tree_url" + > + {{ shortId }} + </a> + </span> + </template> </td> <template v-if="!isMini"> @@ -69,7 +83,10 @@ </td> <td class="commit-update hidden-xs text-right"> - <span :title="tooltipTitle(file.lastCommit.updatedAt)"> + <span + v-if="file.lastCommit.updatedAt" + :title="tooltipTitle(file.lastCommit.updatedAt)" + > {{ timeFormated(file.lastCommit.updatedAt) }} </span> </td> diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue index 5832e603907..09dc9ee25d7 100644 --- a/app/assets/javascripts/repo/components/repo_sidebar.vue +++ b/app/assets/javascripts/repo/components/repo_sidebar.vue @@ -74,6 +74,10 @@ export default { if (file.type === 'tree' && file.opened) { Helper.setDirectoryToClosed(file); Store.setActiveLine(lineNumber); + } else if (file.type === 'submodule') { + file.loading = true; + + gl.utils.visitUrl(file.url); } else { const openFile = Helper.getFileFromPath(file.url); diff --git a/app/assets/javascripts/repo/helpers/repo_helper.js b/app/assets/javascripts/repo/helpers/repo_helper.js index dfaf9caaee7..f7b7f93e4b8 100644 --- a/app/assets/javascripts/repo/helpers/repo_helper.js +++ b/app/assets/javascripts/repo/helpers/repo_helper.js @@ -95,7 +95,7 @@ const RepoHelper = { return Service.getContent() .then((response) => { const data = response.data; - if (response.headers && response.headers['page-title']) data.pageTitle = response.headers['page-title']; + if (response.headers && response.headers['page-title']) data.pageTitle = decodeURI(response.headers['page-title']); if (response.headers && response.headers['is-root'] && !Store.isInitialRoot) { Store.isRoot = convertPermissionToBoolean(response.headers['is-root']); Store.isInitialRoot = Store.isRoot; @@ -157,12 +157,14 @@ const RepoHelper = { }, serializeRepoEntity(type, entity, level = 0) { - const { url, name, icon, last_commit } = entity; + const { id, url, name, icon, last_commit, tree_url } = entity; return { + id, type, name, url, + tree_url, level, icon: `fa-${icon}`, files: [], diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 967fe39256a..391a0519195 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -349,6 +349,6 @@ class ApplicationController < ActionController::Base def set_page_title_header # Per https://tools.ietf.org/html/rfc5987, headers need to be ISO-8859-1, not UTF-8 - response.headers['Page-Title'] = page_title('GitLab').encode('ISO-8859-1') + response.headers['Page-Title'] = URI.escape(page_title('GitLab')) end end diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index e23a82d01be..bc3e95f1aed 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -141,6 +141,17 @@ class GroupsController < Groups::ApplicationController end def load_events + params[:sort] ||= 'latest_activity_desc' + + options = {} + options[:only_owned] = true if params[:shared] == '0' + options[:only_shared] = true if params[:shared] == '1' + + @projects = GroupProjectsFinder.new(params: params, group: group, options: options, current_user: current_user) + .execute + .includes(:namespace) + .page(params[:page]) + @events = EventCollection .new(@projects, offset: params[:offset].to_i, filter: event_filter) .to_a diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 20e050195ea..d085c1a0e57 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -15,7 +15,7 @@ module ProjectsHelper end def link_to_member_avatar(author, opts = {}) - default_opts = { size: 16 } + default_opts = { size: 16, lazy_load: false } opts = default_opts.merge(opts) classes = %W[avatar avatar-inline s#{opts[:size]}] @@ -27,8 +27,26 @@ module ProjectsHelper image_tag(src, width: opts[:size], class: classes, alt: '', "data-src" => avatar) end + def author_content_tag(author, opts = {}) + default_opts = { author_class: 'author', tooltip: false, by_username: false } + opts = default_opts.merge(opts) + + has_tooltip = !opts[:by_username] && opts[:tooltip] + + username = opts[:by_username] ? author.to_reference : author.name + name_tag_options = { class: [opts[:author_class]] } + + if has_tooltip + name_tag_options[:title] = author.to_reference + name_tag_options[:data] = { placement: 'top' } + name_tag_options[:class] << 'has-tooltip' + end + + content_tag(:span, sanitize(username), name_tag_options) + end + def link_to_member(project, author, opts = {}, &block) - default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name", tooltip: false, lazy_load: false } + default_opts = { avatar: true, name: true, title: ":name" } opts = default_opts.merge(opts) return "(deleted)" unless author @@ -39,12 +57,7 @@ module ProjectsHelper author_html << link_to_member_avatar(author, opts) if opts[:avatar] # Build name span tag - if opts[:by_username] - author_html << content_tag(:span, sanitize("@#{author.username}"), class: opts[:author_class]) if opts[:name] - else - tooltip_data = { placement: 'top' } - author_html << content_tag(:span, sanitize(author.name), class: [opts[:author_class], ('has-tooltip' if opts[:tooltip])], title: (author.to_reference if opts[:tooltip]), data: (tooltip_data if opts[:tooltip])) if opts[:name] - end + author_html << author_content_tag(author, opts) if opts[:name] author_html << capture(&block) if block diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index d3b8debb0fd..4dda276bb41 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -203,7 +203,10 @@ class ApplicationSetting < ActiveRecord::Base ensure_cache_setup Rails.cache.fetch(CACHE_KEY) do - ApplicationSetting.last + ApplicationSetting.last.tap do |settings| + # do not cache nils + raise 'missing settings' unless settings + end end rescue # Fall back to an uncached value if there are any problems (e.g. redis down) diff --git a/app/models/ci/artifact_blob.rb b/app/models/ci/artifact_blob.rb index 8b66531ec7b..ec56cc53aea 100644 --- a/app/models/ci/artifact_blob.rb +++ b/app/models/ci/artifact_blob.rb @@ -2,7 +2,7 @@ module Ci class ArtifactBlob include BlobLike - EXTENTIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze + EXTENSIONS_SERVED_BY_PAGES = %w[.html .htm .txt .json].freeze attr_reader :entry @@ -36,17 +36,22 @@ module Ci def external_url(project, job) return unless external_link?(job) - components = project.full_path_components - components << "-/jobs/#{job.id}/artifacts/file/#{path}" - artifact_path = components[1..-1].join('/') + full_path_parts = project.full_path_components + top_level_group = full_path_parts.shift - "#{pages_config.protocol}://#{components[0]}.#{pages_config.host}/#{artifact_path}" + artifact_path = [ + '-', *full_path_parts, '-', + 'jobs', job.id, + 'artifacts', path + ].join('/') + + "#{pages_config.protocol}://#{top_level_group}.#{pages_config.host}/#{artifact_path}" end def external_link?(job) pages_config.enabled && pages_config.artifacts_server && - EXTENTIONS_SERVED_BY_PAGES.include?(File.extname(name)) && + EXTENSIONS_SERVED_BY_PAGES.include?(File.extname(name)) && job.project.public? end diff --git a/app/serializers/submodule_entity.rb b/app/serializers/submodule_entity.rb index 9a7eb5e7880..ed1f1ae0ef0 100644 --- a/app/serializers/submodule_entity.rb +++ b/app/serializers/submodule_entity.rb @@ -7,7 +7,7 @@ class SubmoduleEntity < Grape::Entity 'archive' end - expose :project_url do |blob| + expose :url do |blob| submodule_links(blob, request).first end diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb index 19d75ff2efa..81972df9b3c 100644 --- a/app/services/projects/destroy_service.rb +++ b/app/services/projects/destroy_service.rb @@ -51,7 +51,7 @@ module Projects end def wiki_path - repo_path + '.wiki' + project.wiki.disk_path end def trash_repositories! diff --git a/app/views/discussions/_discussion.html.haml b/app/views/discussions/_discussion.html.haml index 578e751ab47..0f03163a2e8 100644 --- a/app/views/discussions/_discussion.html.haml +++ b/app/views/discussions/_discussion.html.haml @@ -44,4 +44,4 @@ = render "discussions/diff_with_notes", discussion: discussion - else .panel.panel-default - = render "discussions/notes", discussion: discussion + = render partial: "discussions/notes", locals: { discussion: discussion, disable_collapse_class: true } diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 07e64d9aeaf..00909982d59 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -19,13 +19,6 @@ = render 'shared/issuable/search_bar', type: :issues - .row-content-block.second-block - Only issues from the - %strong= @group.name - group are listed here. - - if current_user - To see all issues you should visit #{link_to 'dashboard', issues_dashboard_path} page. - = render 'shared/issues' - else = render 'shared/empty_states/issues', project_select_button: true diff --git a/app/views/groups/merge_requests.html.haml b/app/views/groups/merge_requests.html.haml index e56dc1fb9c2..694292aa7c1 100644 --- a/app/views/groups/merge_requests.html.haml +++ b/app/views/groups/merge_requests.html.haml @@ -15,11 +15,4 @@ = render 'shared/issuable/search_bar', type: :merge_requests - .row-content-block.second-block - Only merge requests from - %strong= @group.name - group are listed here. - - if current_user - To see all merge requests you should visit #{link_to 'dashboard', merge_requests_dashboard_path} page. - = render 'shared/merge_requests' diff --git a/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml b/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml deleted file mode 100644 index 5f98d0cc766..00000000000 --- a/changelogs/unreleased/13637-show-account-confirmation-link-in-e-mail-text.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Confirmation email shows link as text instead of human readable text -merge_request: 14243 -author: bitsapien -type: changed diff --git a/changelogs/unreleased/13711-allow-same-period-housekeeping.yml b/changelogs/unreleased/13711-allow-same-period-housekeeping.yml deleted file mode 100644 index 607a8683aff..00000000000 --- a/changelogs/unreleased/13711-allow-same-period-housekeeping.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Allow to use same periods for different housekeeping tasks (effectively - skipping the lesser task) -merge_request: 13711 -author: cernvcs -type: added diff --git a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml b/changelogs/unreleased/14395-upgrade-gitlab-markup.yml deleted file mode 100644 index d1f90fe5eb1..00000000000 --- a/changelogs/unreleased/14395-upgrade-gitlab-markup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade gitlab-markup gem -merge_request: 14395 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/14553-missing-space-in-log-msg.yml b/changelogs/unreleased/14553-missing-space-in-log-msg.yml deleted file mode 100644 index a0420d49770..00000000000 --- a/changelogs/unreleased/14553-missing-space-in-log-msg.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Add missing space in Sidekiq memory killer log message" -merge_request: 14553 -author: Benjamin Drung -type: fixed diff --git a/changelogs/unreleased/18308-escape-characters.yml b/changelogs/unreleased/18308-escape-characters.yml deleted file mode 100644 index 8766e971490..00000000000 --- a/changelogs/unreleased/18308-escape-characters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Escape quotes in git username -merge_request: 14020 -author: Brandon Everett -type: fixed diff --git a/changelogs/unreleased/18608-lock-issues.yml b/changelogs/unreleased/18608-lock-issues.yml deleted file mode 100644 index 7d907f744f6..00000000000 --- a/changelogs/unreleased/18608-lock-issues.yml +++ /dev/null @@ -1,4 +0,0 @@ -title: Discussion lock for issues and merge requests -merge_request: -author: -type: added diff --git a/changelogs/unreleased/20049-projects-api-forks.yml b/changelogs/unreleased/20049-projects-api-forks.yml deleted file mode 100644 index c6470620f57..00000000000 --- a/changelogs/unreleased/20049-projects-api-forks.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add an API endpoint to determine the forks of a project -merge_request: -author: -type: added diff --git a/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml b/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml deleted file mode 100644 index 245b8129de8..00000000000 --- a/changelogs/unreleased/20824-scope-users-to-members-in-group-issuable-list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Return only group's members in user dropdowns on issuables list pages -merge_request: 14249 -author: -type: changed diff --git a/changelogs/unreleased/21331-improve-confusing-compare-page.yml b/changelogs/unreleased/21331-improve-confusing-compare-page.yml deleted file mode 100644 index 469cc04930b..00000000000 --- a/changelogs/unreleased/21331-improve-confusing-compare-page.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make the labels in the Compare form less confusing -merge_request: 14225 -author: -type: changed diff --git a/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml b/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml deleted file mode 100644 index 36bed037160..00000000000 --- a/changelogs/unreleased/23888-fix-unsubscription-link-for-snippet-notification.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Don't show an "Unsubscribe" link in snippet comment notifications -merge_request: 14764 -author: -type: fixed diff --git a/changelogs/unreleased/24121_extract_yet_another_users_finder.yml b/changelogs/unreleased/24121_extract_yet_another_users_finder.yml deleted file mode 100644 index e43e97303e2..00000000000 --- a/changelogs/unreleased/24121_extract_yet_another_users_finder.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Extract AutocompleteController#users into finder -merge_request: 13778 -author: Maxim Rydkin, Mayra Cabrera -type: other diff --git a/changelogs/unreleased/26890-fix-default-branches-sorting.yml b/changelogs/unreleased/26890-fix-default-branches-sorting.yml deleted file mode 100644 index cf7060190b3..00000000000 --- a/changelogs/unreleased/26890-fix-default-branches-sorting.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the default branches sorting to actually be 'Last updated' -merge_request: 14295 -author: -type: fixed diff --git a/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml new file mode 100644 index 00000000000..1bff4d6930d --- /dev/null +++ b/changelogs/unreleased/28202_decrease_abc_threshold_step5.yml @@ -0,0 +1,5 @@ +--- +title: Decrease ABC threshold to 54.28 +merge_request: 14920 +author: Maxim Rydkin +type: other diff --git a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml deleted file mode 100644 index 6036e1a43a0..00000000000 --- a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step2.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Decrease Perceived Complexity threshold to 15 -merge_request: 14160 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml new file mode 100644 index 00000000000..8ecb832041e --- /dev/null +++ b/changelogs/unreleased/31358_decrease_perceived_complexity_threshold_step3.yml @@ -0,0 +1,5 @@ +--- +title: Decrease Perceived Complexity threshold to 14 +merge_request: 14231 +author: Maxim Rydkin +type: other diff --git a/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml b/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml deleted file mode 100644 index a404456198a..00000000000 --- a/changelogs/unreleased/31362_decrease_cyclomatic_complexity_threshold_step4.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Decrease Cyclomatic Complexity threshold to 13 -merge_request: 14152 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml b/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml deleted file mode 100644 index 6110e245013..00000000000 --- a/changelogs/unreleased/32163-protected-branch-form-should-have-sane-defaults-for-dropdowns.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added defaults for protected branches dropdowns on the repository settings -merge_request: 14278 -author: -type: changed diff --git a/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml b/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml deleted file mode 100644 index d3aac241b75..00000000000 --- a/changelogs/unreleased/33328-usage-ping-for-gitlab-features-and-components.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds gitlab features and components to usage ping data. -merge_request: 14305 -author: -type: other diff --git a/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml b/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml deleted file mode 100644 index 727f3cecd52..00000000000 --- a/changelogs/unreleased/33493-attempt-to-link-saml-users-to-ldap-by-email.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Link SAML users to LDAP by email. -merge_request: 14216 -author: -type: changed diff --git a/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml b/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml deleted file mode 100644 index ce83b140eb6..00000000000 --- a/changelogs/unreleased/34102-online-view-of-artifacts-fe.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add online view of HTML artifacts for public projects -merge_request: 14399 -author: -type: added diff --git a/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml b/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml deleted file mode 100644 index 8260f7fa4b2..00000000000 --- a/changelogs/unreleased/34259-project-denial-of-service-via-gitmodules-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes project denial of service via gitmodules using Extended ASCII. -merge_request: 14301 -author: -type: fixed diff --git a/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml b/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml deleted file mode 100644 index d34e685b5f5..00000000000 --- a/changelogs/unreleased/34366-issue-sidebar-don-t-render-participants-in-collapsed-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Load sidebar participants avatars only when visible -merge_request: 14270 -author: -type: other diff --git a/changelogs/unreleased/34371-cycle-analitcs-global.yml b/changelogs/unreleased/34371-cycle-analitcs-global.yml deleted file mode 100644 index 5e9f0a85e9a..00000000000 --- a/changelogs/unreleased/34371-cycle-analitcs-global.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Removes cycle analytics service and store from global namespace -merge_request: -author: -type: other diff --git a/changelogs/unreleased/34510-board-issues-sql-speedup.yml b/changelogs/unreleased/34510-board-issues-sql-speedup.yml deleted file mode 100644 index 244ff7e9dfa..00000000000 --- a/changelogs/unreleased/34510-board-issues-sql-speedup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Optimize the boards' issues fetching. -merge_request: 14198 -author: -type: other diff --git a/changelogs/unreleased/3523-i18n-autodevops.yml b/changelogs/unreleased/3523-i18n-autodevops.yml deleted file mode 100644 index 10cb22b42a0..00000000000 --- a/changelogs/unreleased/3523-i18n-autodevops.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improves i18n for Auto Devops callout -merge_request: -author: -type: other diff --git a/changelogs/unreleased/35290_allow_public_project_apis.yml b/changelogs/unreleased/35290_allow_public_project_apis.yml deleted file mode 100644 index 1968eee0a53..00000000000 --- a/changelogs/unreleased/35290_allow_public_project_apis.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: made read-only APIs for public merge requests available without authentication -merge_request: 13291 -author: haseebeqx diff --git a/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml b/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml deleted file mode 100644 index b28105556db..00000000000 --- a/changelogs/unreleased/35580-cannot-import-project-with-milestones.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the project import with issues and milestones -merge_request: 14657 -author: -type: fixed diff --git a/changelogs/unreleased/35917_create_services_for_keys.yml b/changelogs/unreleased/35917_create_services_for_keys.yml deleted file mode 100644 index e7cad5a11d5..00000000000 --- a/changelogs/unreleased/35917_create_services_for_keys.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: creation of keys moved to services -merge_request: 13331 -author: haseebeqx diff --git a/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml b/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml deleted file mode 100644 index cea6cb2e48b..00000000000 --- a/changelogs/unreleased/3612-update-script-template-order-in-vue-files.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Re-arrange <script> tags before <template> tags in .vue files -merge_request: 14671 -author: -type: changed diff --git a/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml b/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml deleted file mode 100644 index a820ecee7d2..00000000000 --- a/changelogs/unreleased/36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow prometheus graphs to correctly handle NaN values -merge_request: 14741 -author: -type: fixed diff --git a/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml b/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml deleted file mode 100644 index f5ccb163d98..00000000000 --- a/changelogs/unreleased/36549-circuit-breaker-handles-missing-storages.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow the git circuit breaker to correctly handle missing repository storages -merge_request: 14417 -author: -type: fixed diff --git a/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml b/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml deleted file mode 100644 index a2e1d07158b..00000000000 --- a/changelogs/unreleased/36631-activerecord-statementinvalid-pg-querycanceled-error-canceling-statement-due-to-statement-timeout.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Reschedule merge request diff background migrations to catch failures from - 9.5 run -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/36670-remove-edit-form.yml b/changelogs/unreleased/36670-remove-edit-form.yml deleted file mode 100644 index 4e80b685f67..00000000000 --- a/changelogs/unreleased/36670-remove-edit-form.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove the ability to visit the issue edit form directly -merge_request: 14523 -author: -type: removed diff --git a/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml b/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml deleted file mode 100644 index 3d3efcdbcc6..00000000000 --- a/changelogs/unreleased/36742-hide-close-mr-button-on-merge.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Hide close MR button after merge without reloading page -merge_request: 14122 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml b/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml deleted file mode 100644 index ee6a7287e86..00000000000 --- a/changelogs/unreleased/36829-add-ability-to-verify-gpg-subkeys.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add support for GPG subkeys in signature verification -merge_request: 14517 -author: -type: added diff --git a/changelogs/unreleased/36884-gitaly-admin-version.yml b/changelogs/unreleased/36884-gitaly-admin-version.yml deleted file mode 100644 index 0b3b9a205b5..00000000000 --- a/changelogs/unreleased/36884-gitaly-admin-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add Gitaly version to Admin Dashboard -merge_request: 14313 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml b/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml deleted file mode 100644 index 9ac4a0ae7f3..00000000000 --- a/changelogs/unreleased/36953-add-gitLab-pages-version-to-admin-dashboard.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add GitLab-Pages version to Admin Dashboard -merge_request: 14040 -author: travismiller -type: added diff --git a/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml b/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml deleted file mode 100644 index f3118cf0f2f..00000000000 --- a/changelogs/unreleased/37025-error-500-in-non-utf8-branch-names.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Fixed non-UTF-8 valid branch names from causing an error. -merge_request: 14090 -type: fixed diff --git a/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml b/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml deleted file mode 100644 index 3364b1d46b3..00000000000 --- a/changelogs/unreleased/37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistent.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix incorrect X-axis labels in Prometheus graphs -merge_request: 14258 -author: -type: fixed diff --git a/changelogs/unreleased/37220-es-modules.yml b/changelogs/unreleased/37220-es-modules.yml deleted file mode 100644 index de81fa9e74d..00000000000 --- a/changelogs/unreleased/37220-es-modules.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Exports common_utils utility functions as modules -merge_request: -author: -type: other diff --git a/changelogs/unreleased/37229-mr-widget-status-icon.yml b/changelogs/unreleased/37229-mr-widget-status-icon.yml deleted file mode 100644 index 6d84d1964ca..00000000000 --- a/changelogs/unreleased/37229-mr-widget-status-icon.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: fix merge request widget status icon for failed CI -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/37335-counter-active-state.yml b/changelogs/unreleased/37335-counter-active-state.yml deleted file mode 100644 index a9632201a89..00000000000 --- a/changelogs/unreleased/37335-counter-active-state.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add active states to nav bar counters -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml b/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml deleted file mode 100644 index bec7da26b1a..00000000000 --- a/changelogs/unreleased/37405-admin-page-runner-tag-help-update.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Add help text to runner edit: tags should be separated by commas.' -merge_request: -author: Brendan O'Leary -type: added diff --git a/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml b/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml deleted file mode 100644 index 225ab9acc44..00000000000 --- a/changelogs/unreleased/37483-activity-log-show-wrong-number-of-commits-per-push.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the number representing the amount of commits related to a push event -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/37552-replace-js-true-with-js.yml b/changelogs/unreleased/37552-replace-js-true-with-js.yml deleted file mode 100644 index f7b614a8839..00000000000 --- a/changelogs/unreleased/37552-replace-js-true-with-js.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: 'Replace `tag: true` into `:tag` in the specs' -merge_request: 14653 -author: Jacopo Beschi @jacopo-beschi -type: added diff --git a/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml b/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml deleted file mode 100644 index c3c38b35fa7..00000000000 --- a/changelogs/unreleased/37691-subscription-fires-multiple-notifications.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed duplicate notifications when added multiple labels on an issue -merge_request: 14798 -author: -type: fixed diff --git a/changelogs/unreleased/37970-ci-sections-tracking.yml b/changelogs/unreleased/37970-ci-sections-tracking.yml deleted file mode 100644 index a9011b22c6c..00000000000 --- a/changelogs/unreleased/37970-ci-sections-tracking.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Parse and store gitlab-runner timestamped section markers -merge_request: 14551 -author: -type: added diff --git a/changelogs/unreleased/37970-timestamped-ci.yml b/changelogs/unreleased/37970-timestamped-ci.yml deleted file mode 100644 index 2a4797f069a..00000000000 --- a/changelogs/unreleased/37970-timestamped-ci.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Strip gitlab-runner section markers in build trace HTML view -merge_request: 14393 -author: -type: added diff --git a/changelogs/unreleased/37999-fix-circuit-breaker.yml b/changelogs/unreleased/37999-fix-circuit-breaker.yml deleted file mode 100644 index a75315c4988..00000000000 --- a/changelogs/unreleased/37999-fix-circuit-breaker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix the filesystem shard health check to check all configured shards -merge_request: 14341 -author: -type: fixed diff --git a/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml b/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml deleted file mode 100644 index 8b3fae2c103..00000000000 --- a/changelogs/unreleased/38031-monitoring-hover-info-is-clipped.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Move the deployment flag content to the left when deployment marker is near - the end -merge_request: 14514 -author: -type: fixed diff --git a/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml b/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml deleted file mode 100644 index 591e542cd17..00000000000 --- a/changelogs/unreleased/38036-hover-and-legend-data-should-be-linked.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sync up hover and legend data across all graphs for the prometheus dashboard -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38052-use-simple-api-for-projects.yml b/changelogs/unreleased/38052-use-simple-api-for-projects.yml deleted file mode 100644 index 49c7485861e..00000000000 --- a/changelogs/unreleased/38052-use-simple-api-for-projects.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use `simple=true` for projects API in Projects dropdown for better search performance -merge_request: -author: -type: other diff --git a/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml b/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml deleted file mode 100644 index 579c247c4c2..00000000000 --- a/changelogs/unreleased/38187-38315-fix-dropdown-open-top-bottom-spacing.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix bottom spacing for dropdowns that open upwards -merge_request: 14535 -author: -type: fixed diff --git a/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml b/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml deleted file mode 100644 index df562077fb3..00000000000 --- a/changelogs/unreleased/38197-fix-ImapAuthenticationCheck.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix `rake gitlab:incoming_email:check` and make it report the actual error -merge_request: 14423 -author: -type: fixed diff --git a/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml b/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml deleted file mode 100644 index 768e296fcd7..00000000000 --- a/changelogs/unreleased/38202-cannot-rename-a-hashed-project.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Does not check if an invariant hashed storage path exists on disk when renaming - projects. -merge_request: 14428 -author: -type: fixed diff --git a/changelogs/unreleased/38234-reserve-refs-replace.yml b/changelogs/unreleased/38234-reserve-refs-replace.yml deleted file mode 100644 index 3a5ffbf9db0..00000000000 --- a/changelogs/unreleased/38234-reserve-refs-replace.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Also reserve refs/replace after importing a project -merge_request: 14436 -author: -type: fixed diff --git a/changelogs/unreleased/38389-allow-merge-without-success.yml b/changelogs/unreleased/38389-allow-merge-without-success.yml deleted file mode 100644 index 6a37bcc55fc..00000000000 --- a/changelogs/unreleased/38389-allow-merge-without-success.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Allow merge in MR widget with no pipeline but using "Only allow merge requests - to be merged if the pipeline succeeds" -merge_request: 14633 -author: -type: fixed diff --git a/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml b/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml deleted file mode 100644 index 419e9295d32..00000000000 --- a/changelogs/unreleased/38417-use-explicit-boolean-vue-attribute.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use explicit boolean true attribute for show-disabled-button in Vue files -merge_request: 14672 -author: -type: fixed diff --git a/changelogs/unreleased/38432-fix-notes-type-for-import.yml b/changelogs/unreleased/38432-fix-notes-type-for-import.yml deleted file mode 100644 index db8371f4420..00000000000 --- a/changelogs/unreleased/38432-fix-notes-type-for-import.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix notes type created from import. This should fix some missing notes issues - from imported projects -merge_request: 14524 -author: -type: fixed diff --git a/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml b/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml deleted file mode 100644 index 974adb9ed28..00000000000 --- a/changelogs/unreleased/38502-fix-nav-dropdown-close-animation.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix navigation dropdown close animation on mobile screens -merge_request: 14649 -author: -type: fixed diff --git a/changelogs/unreleased/38534-minigraph.yml b/changelogs/unreleased/38534-minigraph.yml deleted file mode 100644 index eed240eac2d..00000000000 --- a/changelogs/unreleased/38534-minigraph.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixes mini pipeline graph in commit view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38571-fix-exception-in-raven-report.yml b/changelogs/unreleased/38571-fix-exception-in-raven-report.yml deleted file mode 100644 index 62e3b8d304c..00000000000 --- a/changelogs/unreleased/38571-fix-exception-in-raven-report.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Ensure no exception is raised when Raven tries to get the current user in API - context -merge_request: 14580 -author: -type: fixed diff --git a/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml b/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml deleted file mode 100644 index a203bff8410..00000000000 --- a/changelogs/unreleased/38619-fix-comment-delete-confirm-text.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix comment deletion confirmation dialog typo -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml b/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml deleted file mode 100644 index 49d0671233a..00000000000 --- a/changelogs/unreleased/38635-fix-gitlab-check-git-ssh-config.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Whitelist authorized_keys.lock in the gitlab:check rake task -merge_request: 14624 -author: -type: fixed diff --git a/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml b/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml deleted file mode 100644 index 18b1645d7a9..00000000000 --- a/changelogs/unreleased/38696-fix-project-snippets-breadcrumb-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix project snippets breadcrumb link -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml b/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml deleted file mode 100644 index 65a66714bcb..00000000000 --- a/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make tabs on top scrollable on admin dashboard -merge_request: 14685 -author: Takuya Noguchi -type: fixed diff --git a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml b/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml deleted file mode 100644 index bbfe5d49a3e..00000000000 --- a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix broken Y-axis scaling in some Prometheus graphs -merge_request: 14693 -author: -type: fixed diff --git a/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml b/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml deleted file mode 100644 index 89506f88637..00000000000 --- a/changelogs/unreleased/39017-gitlabusagepingworker-is-not-running-on-gitlab-com.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make usage ping scheduling more robust -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml b/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml deleted file mode 100644 index 361b6af196a..00000000000 --- a/changelogs/unreleased/39032-improve-merge-ongoing-check-consistency.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make "merge ongoing" check more consistent -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/39297-remove-help-text-group-lists.yml b/changelogs/unreleased/39297-remove-help-text-group-lists.yml new file mode 100644 index 00000000000..4773d3c5176 --- /dev/null +++ b/changelogs/unreleased/39297-remove-help-text-group-lists.yml @@ -0,0 +1,5 @@ +--- +title: Remove help text from group issues page and group merge requests page +merge_request: 14963 +author: +type: removed diff --git a/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml b/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml deleted file mode 100644 index 44e16512bae..00000000000 --- a/changelogs/unreleased/5836-move-lib-ci-into-gitlab-namespace.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move `lib/ci` to `lib/gitlab/ci` -merge_request: 14078 -author: Maxim Rydkin -type: other diff --git a/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml b/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml deleted file mode 100644 index 5f5a61406da..00000000000 --- a/changelogs/unreleased/add-1000-plus-counters-for-jobs-page.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add 1000+ counters to job page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml b/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml deleted file mode 100644 index 7f098c8f60c..00000000000 --- a/changelogs/unreleased/add-ci-builds-index-for-jobscontroller.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Change index on ci_builds to optimize Jobs Controller -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml b/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml deleted file mode 100644 index 9a600282716..00000000000 --- a/changelogs/unreleased/add-composite-index-on-merge-requests-merge-commit-sha.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add index for merge_requests.merge_commit_sha -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-labels-template-index.yml b/changelogs/unreleased/add-labels-template-index.yml deleted file mode 100644 index 5f66c4ce181..00000000000 --- a/changelogs/unreleased/add-labels-template-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add (partial) index on Labels.template -merge_request: -author: -type: other diff --git a/changelogs/unreleased/add-view-replaced-file-link.yml b/changelogs/unreleased/add-view-replaced-file-link.yml deleted file mode 100644 index b5a85f2e0f2..00000000000 --- a/changelogs/unreleased/add-view-replaced-file-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add view replaced file link for image diffs -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/add_closed_at_attribute.yml b/changelogs/unreleased/add_closed_at_attribute.yml deleted file mode 100644 index 3afb75e8915..00000000000 --- a/changelogs/unreleased/add_closed_at_attribute.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add 'closed_at' attribute to Issues API -merge_request: 14316 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml b/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml deleted file mode 100644 index 0470c6519f4..00000000000 --- a/changelogs/unreleased/add_tooltip_for_milestone_in_issues_list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add tooltip for milestone due date to issue and merge request lists -merge_request: 14318 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/adjusting-tooltips.yml b/changelogs/unreleased/adjusting-tooltips.yml deleted file mode 100644 index 726b75caecd..00000000000 --- a/changelogs/unreleased/adjusting-tooltips.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adjust tooltips to adhere to 8px grid and make them more readable -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/an-popen-deadline.yml b/changelogs/unreleased/an-popen-deadline.yml deleted file mode 100644 index 4b74c63ed5c..00000000000 --- a/changelogs/unreleased/an-popen-deadline.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a timeout on certain git operations -merge_request: 14872 -author: -type: security diff --git a/changelogs/unreleased/breadcrumb-item-links.yml b/changelogs/unreleased/breadcrumb-item-links.yml deleted file mode 100644 index 9b66456efca..00000000000 --- a/changelogs/unreleased/breadcrumb-item-links.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed issue/merge request breadcrumb titles not having links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/breadcrumbs-line-height-padding.yml b/changelogs/unreleased/breadcrumbs-line-height-padding.yml deleted file mode 100644 index 3ac56c8b593..00000000000 --- a/changelogs/unreleased/breadcrumbs-line-height-padding.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: breadcrumbs receives padding when double lined -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml b/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml deleted file mode 100644 index 3a99729fb48..00000000000 --- a/changelogs/unreleased/bugfix-graph-friendly-notes-number.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show notes number more user-friendly in the graph -merge_request: 13949 -author: Vladislav Kaverin -type: changed diff --git a/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml b/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml deleted file mode 100644 index 95f56facc4b..00000000000 --- a/changelogs/unreleased/bvl-fix-deleting-forked-projects.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix error when updating a forked project with deleted `ForkedProjectLink` -merge_request: 14916 -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fix-group-atom-feed.yml b/changelogs/unreleased/bvl-fix-group-atom-feed.yml new file mode 100644 index 00000000000..48f67db7799 --- /dev/null +++ b/changelogs/unreleased/bvl-fix-group-atom-feed.yml @@ -0,0 +1,5 @@ +--- +title: Fix the atom feed for group events +merge_request: 14974 +author: +type: fixed diff --git a/changelogs/unreleased/bvl-fix-locale-path.yml b/changelogs/unreleased/bvl-fix-locale-path.yml deleted file mode 100644 index 97e0e000e3c..00000000000 --- a/changelogs/unreleased/bvl-fix-locale-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Correctly render asset path for locales with a region -merge_request: 14924 -author: -type: fixed diff --git a/changelogs/unreleased/bvl-fork-network-schema.yml b/changelogs/unreleased/bvl-fork-network-schema.yml deleted file mode 100644 index 97b2d5acada..00000000000 --- a/changelogs/unreleased/bvl-fork-network-schema.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow creating merge requests across a fork network -merge_request: 14422 -author: -type: changed diff --git a/changelogs/unreleased/cache-issuable-template-names.yml b/changelogs/unreleased/cache-issuable-template-names.yml deleted file mode 100644 index 858fdff2db2..00000000000 --- a/changelogs/unreleased/cache-issuable-template-names.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Cache issue and MR template names in Redis -merge_request: -author: -type: other diff --git a/changelogs/unreleased/change-dashed-border-button-color.yml b/changelogs/unreleased/change-dashed-border-button-color.yml deleted file mode 100644 index 038bea79273..00000000000 --- a/changelogs/unreleased/change-dashed-border-button-color.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: changed dashed border button color to be darker -merge_request: !14041 -author: -type: other diff --git a/changelogs/unreleased/close-issue-by-implements.yml b/changelogs/unreleased/close-issue-by-implements.yml deleted file mode 100644 index fe36ce3f7aa..00000000000 --- a/changelogs/unreleased/close-issue-by-implements.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Add \"implements\" to the default issue closing message regex" -merge_request: 14612 -author: Guilherme Vieira -type: added diff --git a/changelogs/unreleased/commit-row-avatar-align-top.yml b/changelogs/unreleased/commit-row-avatar-align-top.yml deleted file mode 100644 index aa5ab770bd8..00000000000 --- a/changelogs/unreleased/commit-row-avatar-align-top.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed commit avatars being centered vertically -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml b/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml deleted file mode 100644 index 9e6a429f6f0..00000000000 --- a/changelogs/unreleased/consistent-tooltip-direction-on-commits.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Tooltips in the commit info box now all face the same direction -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/content-title-link-hover-bg.yml b/changelogs/unreleased/content-title-link-hover-bg.yml deleted file mode 100644 index c4c31c2ad06..00000000000 --- a/changelogs/unreleased/content-title-link-hover-bg.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed navbar title colors leaking out of the navbar -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/declarative-policy-optimisations.yml b/changelogs/unreleased/declarative-policy-optimisations.yml deleted file mode 100644 index dc51c89d575..00000000000 --- a/changelogs/unreleased/declarative-policy-optimisations.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Speed up permission checks -merge_request: -author: -type: other diff --git a/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml b/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml deleted file mode 100644 index 057407b78d9..00000000000 --- a/changelogs/unreleased/dm-bitbucket-import-truncated-shas.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Fix bug that caused merge requests with diff notes imported from Bitbucket - to raise errors -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-closing-issue-urls.yml b/changelogs/unreleased/dm-closing-issue-urls.yml deleted file mode 100644 index 059e406b63d..00000000000 --- a/changelogs/unreleased/dm-closing-issue-urls.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Correctly detect multiple issue URLs after 'Closes...' in MR descriptions -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-copy-parallel-diff.yml b/changelogs/unreleased/dm-copy-parallel-diff.yml deleted file mode 100644 index 96a65007661..00000000000 --- a/changelogs/unreleased/dm-copy-parallel-diff.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Only copy old/new code when selecting left/right side of parallel diff -merge_request: -author: -type: added diff --git a/changelogs/unreleased/dm-pat-revoke.yml b/changelogs/unreleased/dm-pat-revoke.yml deleted file mode 100644 index 32ac66056d5..00000000000 --- a/changelogs/unreleased/dm-pat-revoke.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Set default scope on PATs that don't have one set to allow them to be revoked -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/dm-simple-project-avatar-url.yml b/changelogs/unreleased/dm-simple-project-avatar-url.yml deleted file mode 100644 index e517345f5d2..00000000000 --- a/changelogs/unreleased/dm-simple-project-avatar-url.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expose avatar_url when requesting list of projects from API with simple=true -merge_request: -author: -type: added diff --git a/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml b/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml deleted file mode 100644 index 3dfe4114cc9..00000000000 --- a/changelogs/unreleased/docs-17499-documentation-errors-about-creating-a-new-tag.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix docs for lightweight tag creation via API -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml b/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml deleted file mode 100644 index 3cdcff8caaf..00000000000 --- a/changelogs/unreleased/docs-28814-clarify-artifacts-ref.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Clarify artifact download via the API only accepts branch or tag name for ref -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml b/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml deleted file mode 100644 index eea679d0814..00000000000 --- a/changelogs/unreleased/docs-38152-bump-recommended-mysql-version.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Change recommended MySQL version to 5.6 -merge_request: -author: -type: other diff --git a/changelogs/unreleased/docs-add-summary-about-project-archiving.yml b/changelogs/unreleased/docs-add-summary-about-project-archiving.yml deleted file mode 100644 index cc1b48a682d..00000000000 --- a/changelogs/unreleased/docs-add-summary-about-project-archiving.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add documentation to summarise project archiving -merge_request: 14650 -author: -type: other diff --git a/changelogs/unreleased/docs-openid-connect.yml b/changelogs/unreleased/docs-openid-connect.yml deleted file mode 100644 index 3989ec53cfa..00000000000 --- a/changelogs/unreleased/docs-openid-connect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add link to OpenID Connect documentation -merge_request: 14368 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/ee-add-project-repository-storages-index.yml b/changelogs/unreleased/ee-add-project-repository-storages-index.yml deleted file mode 100644 index 8a144783cec..00000000000 --- a/changelogs/unreleased/ee-add-project-repository-storages-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Index projects on repository storage -merge_request: 14414 -author: -type: other diff --git a/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml b/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml deleted file mode 100644 index d16e052cd92..00000000000 --- a/changelogs/unreleased/expose-last-pipeline-details-in-api-for-single-commit.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expose last pipeline details in API response when getting a single commit -merge_request: 13521 -author: Mehdi Lahmam (@mehlah) -type: added diff --git a/changelogs/unreleased/feature-custom-attributes.yml b/changelogs/unreleased/feature-custom-attributes.yml deleted file mode 100644 index 98736bc8d72..00000000000 --- a/changelogs/unreleased/feature-custom-attributes.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Support custom attributes on users -merge_request: 13038 -author: Markus Koller diff --git a/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml new file mode 100644 index 00000000000..1f36d84092a --- /dev/null +++ b/changelogs/unreleased/feature-reliable-rspec-with-eval-script.yml @@ -0,0 +1,5 @@ +--- +title: Get true failure from evalulate_script by checking for element beforehand +merge_request: 14898 +author: +type: fixed diff --git a/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml b/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml deleted file mode 100644 index 14b35b6daee..00000000000 --- a/changelogs/unreleased/feature-sm-35954-create-kubernetes-cluster-on-gke-from-k8s-service.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Create Kubernetes cluster on GKE from k8s service -merge_request: 14470 -author: -type: added diff --git a/changelogs/unreleased/feature-verify_secondary_emails.yml b/changelogs/unreleased/feature-verify_secondary_emails.yml deleted file mode 100644 index e1ecc527f85..00000000000 --- a/changelogs/unreleased/feature-verify_secondary_emails.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: A confirmation email is now sent when adding a secondary email address -merge_request: -author: digitalmoksha -type: added diff --git a/changelogs/unreleased/ff_port_from_ee.yml b/changelogs/unreleased/ff_port_from_ee.yml deleted file mode 100644 index e1cb7804a47..00000000000 --- a/changelogs/unreleased/ff_port_from_ee.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Move Custom merge methods from EE -merge_request: -author: -type: added diff --git a/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml b/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml deleted file mode 100644 index efb993eff71..00000000000 --- a/changelogs/unreleased/fix-edit-project-service-cancel-button-position.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix edit project service cancel button position -merge_request: 14596 -author: Matt Coleman -type: fixed diff --git a/changelogs/unreleased/fix-gpg-case-insensitive.yml b/changelogs/unreleased/fix-gpg-case-insensitive.yml deleted file mode 100644 index 744ec00a4a8..00000000000 --- a/changelogs/unreleased/fix-gpg-case-insensitive.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Compare email addresses case insensitively when verifying GPG signatures -merge_request: 14376 -author: Tim Bishop -type: fixed diff --git a/changelogs/unreleased/fix-image-diff-swipe-handle.yml b/changelogs/unreleased/fix-image-diff-swipe-handle.yml deleted file mode 100644 index a4e0c2e8465..00000000000 --- a/changelogs/unreleased/fix-image-diff-swipe-handle.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix image diff swipe handle offset to correctly align with the frame -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-multi-line-hook-output.yml b/changelogs/unreleased/fix-multi-line-hook-output.yml deleted file mode 100644 index f625ec2ee6c..00000000000 --- a/changelogs/unreleased/fix-multi-line-hook-output.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Display full pre-receive and post-receive hook output in GitLab UI -merge_request: 14222 -author: Robin Bobbitt -type: fixed diff --git a/changelogs/unreleased/fix-resolved-side-by-side.yml b/changelogs/unreleased/fix-resolved-side-by-side.yml deleted file mode 100644 index 424130c3eb0..00000000000 --- a/changelogs/unreleased/fix-resolved-side-by-side.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix resolved discussions not expanding on side by side view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-sidebar-with-scrollbars.yml b/changelogs/unreleased/fix-sidebar-with-scrollbars.yml deleted file mode 100644 index e0b3851b97f..00000000000 --- a/changelogs/unreleased/fix-sidebar-with-scrollbars.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed the sidebar scrollbar overlapping links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fix-system-hook-docs.yml b/changelogs/unreleased/fix-system-hook-docs.yml new file mode 100644 index 00000000000..393c84a2eff --- /dev/null +++ b/changelogs/unreleased/fix-system-hook-docs.yml @@ -0,0 +1,5 @@ +--- +title: Clarify system_hook triggers in documentation +merge_request: 14957 +author: Joe Marty +type: other diff --git a/changelogs/unreleased/fix-tooltip-width-issue-board.yml b/changelogs/unreleased/fix-tooltip-width-issue-board.yml deleted file mode 100644 index a648953c5bd..00000000000 --- a/changelogs/unreleased/fix-tooltip-width-issue-board.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Issue board tooltips are now the correct width when the column is collapsed -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml b/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml deleted file mode 100644 index c57fceec92f..00000000000 --- a/changelogs/unreleased/fix-update-doorkeeper-openid-connect.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Upgrade doorkeeper-openid_connect -merge_request: 14372 -author: Markus Koller -type: other diff --git a/changelogs/unreleased/fl-autodevops-fix.yml b/changelogs/unreleased/fl-autodevops-fix.yml deleted file mode 100644 index 21b739231a8..00000000000 --- a/changelogs/unreleased/fl-autodevops-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve autodevops banner UX and render it only in project page -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/fl-fix-ca-time-component.yml b/changelogs/unreleased/fl-fix-ca-time-component.yml deleted file mode 100644 index ecd377409ca..00000000000 --- a/changelogs/unreleased/fl-fix-ca-time-component.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix typo in cycle analytics breaking time component -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/force-two-up-view.yml b/changelogs/unreleased/force-two-up-view.yml deleted file mode 100644 index 1074eb384bb..00000000000 --- a/changelogs/unreleased/force-two-up-view.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Force two up view to load by default for image diffs -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml b/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml deleted file mode 100644 index 13ec113167f..00000000000 --- a/changelogs/unreleased/gem-sm-bump-google-api-client-gem-from-0-8-6-to-0-13-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Bump google-api-client Gem from 0.8.6 to 0.13.6 -merge_request: -author: -type: other diff --git a/changelogs/unreleased/gitaly_feature_flag_metadata.yml b/changelogs/unreleased/gitaly_feature_flag_metadata.yml deleted file mode 100644 index 58e42ef9324..00000000000 --- a/changelogs/unreleased/gitaly_feature_flag_metadata.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add client and call site metadata to Gitaly calls for better traceability -merge_request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14332 -author: -type: added diff --git a/changelogs/unreleased/group-milestones-breadcrumb.yml b/changelogs/unreleased/group-milestones-breadcrumb.yml deleted file mode 100644 index 87085759fda..00000000000 --- a/changelogs/unreleased/group-milestones-breadcrumb.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed milestone breadcrumb links -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/group-sort-dropdown-blank.yml b/changelogs/unreleased/group-sort-dropdown-blank.yml deleted file mode 100644 index dd16892be4d..00000000000 --- a/changelogs/unreleased/group-sort-dropdown-blank.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed group sort dropdown defaulting to empty -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/hash-mr-scroll-load.yml b/changelogs/unreleased/hash-mr-scroll-load.yml deleted file mode 100644 index 7e3965add03..00000000000 --- a/changelogs/unreleased/hash-mr-scroll-load.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed notes not being scrolled to in merge requests -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/hashed-storage-migration-path.yml b/changelogs/unreleased/hashed-storage-migration-path.yml deleted file mode 100644 index 5890eb09c38..00000000000 --- a/changelogs/unreleased/hashed-storage-migration-path.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Script to migrate project's repositories to new Hashed Storage -merge_request: 14067 -author: -type: added diff --git a/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml b/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml deleted file mode 100644 index 22ac9b9073f..00000000000 --- a/changelogs/unreleased/hide-read-registry-scope-when-registry-disabled.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Hide read_registry scope when registry is disabled on instance -merge_request: 13314 -author: Robin Bobbitt diff --git a/changelogs/unreleased/ie-event-polyfill.yml b/changelogs/unreleased/ie-event-polyfill.yml deleted file mode 100644 index eaab089a47e..00000000000 --- a/changelogs/unreleased/ie-event-polyfill.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adds Event polyfill for IE11 -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/import-sources-fix.yml b/changelogs/unreleased/import-sources-fix.yml deleted file mode 100644 index 03e23bc617c..00000000000 --- a/changelogs/unreleased/import-sources-fix.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Read import sources from setting at first initialization -merge_request: 14141 -author: Visay Keo -type: fixed diff --git a/changelogs/unreleased/improve_sorting_list.yml b/changelogs/unreleased/improve_sorting_list.yml deleted file mode 100644 index a3730e23ed1..00000000000 --- a/changelogs/unreleased/improve_sorting_list.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve list of sorting options -merge_request: 14320 -author: Vitaliy @blackst0ne Klachkov -type: added diff --git a/changelogs/unreleased/issue_32215.yml b/changelogs/unreleased/issue_32215.yml deleted file mode 100644 index c608eb6dd28..00000000000 --- a/changelogs/unreleased/issue_32215.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Allow developer role to admin milestones -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/issue_35873.yml b/changelogs/unreleased/issue_35873.yml deleted file mode 100644 index 65064b97e56..00000000000 --- a/changelogs/unreleased/issue_35873.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Commenting on image diffs -merge_request: 14061 -author: -type: added diff --git a/changelogs/unreleased/italicized_emoji.yml b/changelogs/unreleased/italicized_emoji.yml deleted file mode 100644 index d3f15f94363..00000000000 --- a/changelogs/unreleased/italicized_emoji.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update native unicode emojis to always render as normal text (previously could render italicized) -merge_request: -author: Branka Martinovic -type: fixed diff --git a/changelogs/unreleased/jobs-sort-by-id.yml b/changelogs/unreleased/jobs-sort-by-id.yml deleted file mode 100644 index ec2c3a17b74..00000000000 --- a/changelogs/unreleased/jobs-sort-by-id.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Sort JobsController by id, not created_at -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml b/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml deleted file mode 100644 index acbb24d16fc..00000000000 --- a/changelogs/unreleased/kt-bug-fix-revision-and-size-for-container-registry.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix revision and total size missing for Container Registry -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/lint-changelog-yaml.yml b/changelogs/unreleased/lint-changelog-yaml.yml deleted file mode 100644 index dcc8bf54827..00000000000 --- a/changelogs/unreleased/lint-changelog-yaml.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Detect when changelog entries are invalid -merge_request: -author: -type: other diff --git a/changelogs/unreleased/mentions-in-comments.yml b/changelogs/unreleased/mentions-in-comments.yml deleted file mode 100644 index 907f455007b..00000000000 --- a/changelogs/unreleased/mentions-in-comments.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Makes @mentions links have a different styling for better separation -merge_request: -author: -type: added diff --git a/changelogs/unreleased/merge-request-notes-performance.yml b/changelogs/unreleased/merge-request-notes-performance.yml deleted file mode 100644 index 6cf7a5047df..00000000000 --- a/changelogs/unreleased/merge-request-notes-performance.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use a UNION ALL for getting merge request notes -merge_request: -author: -type: other diff --git a/changelogs/unreleased/milestone-avatar-issuable-link.yml b/changelogs/unreleased/milestone-avatar-issuable-link.yml deleted file mode 100644 index 7915ad60fa8..00000000000 --- a/changelogs/unreleased/milestone-avatar-issuable-link.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed milestone issuable assignee link URL -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/mk-clarify-moving-namespaces.yml b/changelogs/unreleased/mk-clarify-moving-namespaces.yml deleted file mode 100644 index 8d89c296f61..00000000000 --- a/changelogs/unreleased/mk-clarify-moving-namespaces.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Expand docs for changing username or group path -merge_request: 13914 -author: -type: other diff --git a/changelogs/unreleased/mk-normalize-ldap-user-dns.yml b/changelogs/unreleased/mk-normalize-ldap-user-dns.yml deleted file mode 100644 index 5a128d6acc1..00000000000 --- a/changelogs/unreleased/mk-normalize-ldap-user-dns.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Search or compare LDAP DNs case-insensitively and ignore excess whitespace -merge_request: 14697 -author: -type: fixed diff --git a/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml b/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml deleted file mode 100644 index 39b636bdfda..00000000000 --- a/changelogs/unreleased/mr-side-by-side-breadcrumbs-container.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed breadcrumbs container expanding in side-by-side diff view -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/mr-widget-merged-date-tooltip.yml b/changelogs/unreleased/mr-widget-merged-date-tooltip.yml deleted file mode 100644 index ea22993ff52..00000000000 --- a/changelogs/unreleased/mr-widget-merged-date-tooltip.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fixed merge request widget merged & closed date tooltip text -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/multi-file-editor-submodules.yml b/changelogs/unreleased/multi-file-editor-submodules.yml new file mode 100644 index 00000000000..b83a50957c5 --- /dev/null +++ b/changelogs/unreleased/multi-file-editor-submodules.yml @@ -0,0 +1,5 @@ +--- +title: Added submodule support in multi-file editor +merge_request: +author: +type: added diff --git a/changelogs/unreleased/prevent-creating-multiple-application-settings.yml b/changelogs/unreleased/prevent-creating-multiple-application-settings.yml deleted file mode 100644 index fd49028b9e9..00000000000 --- a/changelogs/unreleased/prevent-creating-multiple-application-settings.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent creating multiple ApplicationSetting instances -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/project-page-clearer.yml b/changelogs/unreleased/project-page-clearer.yml deleted file mode 100644 index 7db01373360..00000000000 --- a/changelogs/unreleased/project-page-clearer.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Added tabs to dashboard/projects to easily switch to personal projects -merge_request: -author: -type: added diff --git a/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml b/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml deleted file mode 100644 index af359ce96b4..00000000000 --- a/changelogs/unreleased/rc-fix-gh-import-branches-performance.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Improve GitHub import performance -merge_request: 14445 -author: -type: other diff --git a/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml b/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml deleted file mode 100644 index 69695e403a9..00000000000 --- a/changelogs/unreleased/rd-fix-case-sensative-email-conf-signup.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix case sensitive email confirmation on signup -merge_request: 14606 -author: robdel12 -type: fixed diff --git a/changelogs/unreleased/refactor-animate-js.yml b/changelogs/unreleased/refactor-animate-js.yml deleted file mode 100644 index ec32d68bbdd..00000000000 --- a/changelogs/unreleased/refactor-animate-js.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove animate.js and label animation. -merge_request: -author: -type: removed diff --git a/changelogs/unreleased/refactor-monitoring-service.yml b/changelogs/unreleased/refactor-monitoring-service.yml deleted file mode 100644 index 685397cadb8..00000000000 --- a/changelogs/unreleased/refactor-monitoring-service.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Perform prometheus data endpoint requests in parallel -merge_request: 14003 -author: -type: fixed diff --git a/changelogs/unreleased/remote_user.yml b/changelogs/unreleased/remote_user.yml deleted file mode 100644 index 75a941fa95f..00000000000 --- a/changelogs/unreleased/remote_user.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Add username as GL_USERNAME in hooks -merge_request: -author: diff --git a/changelogs/unreleased/remove-temporary-ci-index.yml b/changelogs/unreleased/remove-temporary-ci-index.yml deleted file mode 100644 index a319f7fff7f..00000000000 --- a/changelogs/unreleased/remove-temporary-ci-index.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove an index on ci_builds meant to be only temporary -merge_request: -author: -type: other diff --git a/changelogs/unreleased/remove-use-key-worker.yml b/changelogs/unreleased/remove-use-key-worker.yml deleted file mode 100644 index a39bcae66bc..00000000000 --- a/changelogs/unreleased/remove-use-key-worker.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Stop using Sidekiq for updating Key#last_used_at -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/remove_repo_prefix_from_api.yml b/changelogs/unreleased/remove_repo_prefix_from_api.yml deleted file mode 100644 index bf2075e529c..00000000000 --- a/changelogs/unreleased/remove_repo_prefix_from_api.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove 'Repo' prefix from API entites -merge_request: 14694 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_emails-feature.yml b/changelogs/unreleased/replace_emails-feature.yml deleted file mode 100644 index d7f1a7a7ba9..00000000000 --- a/changelogs/unreleased/replace_emails-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the profile/emails.feature spinach test with an rspec analog -merge_request: 14172 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_group_links-feature.yml b/changelogs/unreleased/replace_group_links-feature.yml deleted file mode 100644 index 7dd157632c9..00000000000 --- a/changelogs/unreleased/replace_group_links-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace project/group_links.feature spinach test with an rspec analog -merge_request: 14169 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_milestone-feature.yml b/changelogs/unreleased/replace_milestone-feature.yml deleted file mode 100644 index effe6d65645..00000000000 --- a/changelogs/unreleased/replace_milestone-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the project/milestone.feature spinach test with an rspec analog -merge_request: 14171 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_profile_active_tab-feature.yml b/changelogs/unreleased/replace_profile_active_tab-feature.yml deleted file mode 100644 index e911396a2b9..00000000000 --- a/changelogs/unreleased/replace_profile_active_tab-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'profile/active_tab.feature' spinach test with an rspec analog -merge_request: 14239 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_archived-feature.yml b/changelogs/unreleased/replace_project_archived-feature.yml deleted file mode 100644 index d0697347aa0..00000000000 --- a/changelogs/unreleased/replace_project_archived-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/archived.feature' spinach test with an rspec analog -merge_request: 14322 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_builds_summary-feature.yml b/changelogs/unreleased/replace_project_builds_summary-feature.yml deleted file mode 100644 index 48652b39b7e..00000000000 --- a/changelogs/unreleased/replace_project_builds_summary-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/builds/summary.feature' spinach test with an rspec analog -merge_request: 14177 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_commits_revert-feature.yml b/changelogs/unreleased/replace_project_commits_revert-feature.yml deleted file mode 100644 index 7fc9fcf3580..00000000000 --- a/changelogs/unreleased/replace_project_commits_revert-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/commits/revert.feature' spinach test with an rspec analog -merge_request: 14325 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml b/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml deleted file mode 100644 index a4a7435d4fa..00000000000 --- a/changelogs/unreleased/replace_project_issues_award_emoji-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/issues/award_emoji.feature' spinach test with an rspec analog -merge_request: 14202 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests-feature.yml b/changelogs/unreleased/replace_project_merge_requests-feature.yml deleted file mode 100644 index 082c922a32b..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/merge_requests.feature' spinach test with an rspec analog -merge_request: 14621 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml b/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml deleted file mode 100644 index 03562d6025e..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests_accept-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/merge_requests/accept.feature' spinach test with an rspec analog -merge_request: 14176 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml b/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml deleted file mode 100644 index 7d1ab4566b6..00000000000 --- a/changelogs/unreleased/replace_project_merge_requests_revert-feature.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Replace the 'project/merge_requests/revert.feature' spinach test with an rspec - analog -merge_request: 14201 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_service-feature.yml b/changelogs/unreleased/replace_project_service-feature.yml deleted file mode 100644 index 11814732a9b..00000000000 --- a/changelogs/unreleased/replace_project_service-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/service.feature' spinach test with an rspec analog -merge_request: 14432 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_shortcuts-feature.yml b/changelogs/unreleased/replace_project_shortcuts-feature.yml deleted file mode 100644 index 89e47a7a983..00000000000 --- a/changelogs/unreleased/replace_project_shortcuts-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/shortcuts.feature' spinach test with an rspec analog -merge_request: 14431 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_project_snippets-feature.yml b/changelogs/unreleased/replace_project_snippets-feature.yml deleted file mode 100644 index 4fdee70008a..00000000000 --- a/changelogs/unreleased/replace_project_snippets-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'project/snippets.feature' spinach test with an rspec analog -merge_request: 14326 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_search-feature.yml b/changelogs/unreleased/replace_search-feature.yml deleted file mode 100644 index 487f602ba30..00000000000 --- a/changelogs/unreleased/replace_search-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the 'search.feature' spinach test with an rspec analog -merge_request: 14248 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_spinach_wiki-feature.yml b/changelogs/unreleased/replace_spinach_wiki-feature.yml deleted file mode 100644 index a1801f1b58d..00000000000 --- a/changelogs/unreleased/replace_spinach_wiki-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace 'project/wiki.feature' spinach test with an rspec analog -merge_request: 13856 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/replace_team_management-feature.yml b/changelogs/unreleased/replace_team_management-feature.yml deleted file mode 100644 index bc2bb17faf1..00000000000 --- a/changelogs/unreleased/replace_team_management-feature.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Replace the project/team_management.feature spinach test with an rspec analog -merge_request: 14173 -author: Vitaliy @blackst0ne Klachkov -type: other diff --git a/changelogs/unreleased/rotated_profile_image.yml b/changelogs/unreleased/rotated_profile_image.yml deleted file mode 100644 index 1e221e47379..00000000000 --- a/changelogs/unreleased/rotated_profile_image.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix profile image orientation based on EXIF data gvieira37 -merge_request: 14461 -author: gvieira37 -type: fixed diff --git a/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml b/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml deleted file mode 100644 index c9fb042aa37..00000000000 --- a/changelogs/unreleased/save-a-query-on-todos-with-no-filters.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Remove a SQL query from the todos index page -merge_request: -author: -type: other diff --git a/changelogs/unreleased/sh-fix-container-registry-destroy.yml b/changelogs/unreleased/sh-fix-container-registry-destroy.yml new file mode 100644 index 00000000000..21a463da62a --- /dev/null +++ b/changelogs/unreleased/sh-fix-container-registry-destroy.yml @@ -0,0 +1,5 @@ +--- +title: Fix deletion of container registry or images returning an error +merge_request: +author: +type: fixed diff --git a/changelogs/unreleased/sh-fix-username-logging.yml b/changelogs/unreleased/sh-fix-username-logging.yml deleted file mode 100644 index dadf3fb6729..00000000000 --- a/changelogs/unreleased/sh-fix-username-logging.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix username and ID not logging in production_json.log for Git activity -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/sh-show-all-slack-names.yml b/changelogs/unreleased/sh-show-all-slack-names.yml deleted file mode 100644 index f970cd0fb15..00000000000 --- a/changelogs/unreleased/sh-show-all-slack-names.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Include GitLab full name in Slack messages -merge_request: -author: -type: changed diff --git a/changelogs/unreleased/sh-thread-safe-markdown.yml b/changelogs/unreleased/sh-thread-safe-markdown.yml deleted file mode 100644 index af7d9d58a9f..00000000000 --- a/changelogs/unreleased/sh-thread-safe-markdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Make Redcarpet Markdown renderer thread-safe -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/tag-link-size.yml b/changelogs/unreleased/tag-link-size.yml deleted file mode 100644 index d94e415ba1f..00000000000 --- a/changelogs/unreleased/tag-link-size.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Adjusts tag link to avoid underlining spaces -merge_request: 14544 -author: Guilherme Vieira -type: fixed diff --git a/changelogs/unreleased/tc-geo-read-only-idea.yml b/changelogs/unreleased/tc-geo-read-only-idea.yml deleted file mode 100644 index e1b52eef2ca..00000000000 --- a/changelogs/unreleased/tc-geo-read-only-idea.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Create idea of read-only database -merge_request: 14688 -author: -type: changed diff --git a/changelogs/unreleased/uipolish-fix-2factor-warning.yml b/changelogs/unreleased/uipolish-fix-2factor-warning.yml deleted file mode 100644 index 9f55207d309..00000000000 --- a/changelogs/unreleased/uipolish-fix-2factor-warning.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Two factor auth messages in settings no longer overlap the button -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml b/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml deleted file mode 100644 index 34aa3d0db6f..00000000000 --- a/changelogs/unreleased/uipolish-fix-remember-me-checkbox.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Made the "remember me" check boxes have consistent styles and alignment -merge_request: -author: Jedidiah Broadbent -type: fixed diff --git a/changelogs/unreleased/update-pages-0-6.yml b/changelogs/unreleased/update-pages-0-6.yml deleted file mode 100644 index 507bb4d78e9..00000000000 --- a/changelogs/unreleased/update-pages-0-6.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Update GitLab Pages to v0.6.0 -merge_request: 14630 -author: -type: other diff --git a/changelogs/unreleased/use-title.yml b/changelogs/unreleased/use-title.yml new file mode 100644 index 00000000000..647e282eb69 --- /dev/null +++ b/changelogs/unreleased/use-title.yml @@ -0,0 +1,5 @@ +--- +title: Use title as placeholder instead of issue title for reusability +merge_request: +author: +type: other diff --git a/changelogs/unreleased/valid-branch-name-dash-bug.yml b/changelogs/unreleased/valid-branch-name-dash-bug.yml deleted file mode 100644 index 89e4578b3e5..00000000000 --- a/changelogs/unreleased/valid-branch-name-dash-bug.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Prevent branches or tags from starting with invalid characters (e.g. -, .) -merge_request: -author: -type: fixed diff --git a/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml b/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml deleted file mode 100644 index faa5d3303c6..00000000000 --- a/changelogs/unreleased/voogsgerd-gitlab-ce-daniel-legacy-config.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Removed two legacy config options -merge_request: -author: Daniel Voogsgerd -type: deprecated diff --git a/changelogs/unreleased/winh-delete-account-modal.yml b/changelogs/unreleased/winh-delete-account-modal.yml deleted file mode 100644 index f1e2710fdcc..00000000000 --- a/changelogs/unreleased/winh-delete-account-modal.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Show confirmation modal before deleting account -merge_request: 14360 -author: -type: changed diff --git a/changelogs/unreleased/winh-indeterminate-dropdown.yml b/changelogs/unreleased/winh-indeterminate-dropdown.yml deleted file mode 100644 index 61205d1643e..00000000000 --- a/changelogs/unreleased/winh-indeterminate-dropdown.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Fix alignment for indeterminate marker in dropdowns -merge_request: 14809 -author: -type: fixed diff --git a/changelogs/unreleased/winh-protected-branch-modal-merged.yml b/changelogs/unreleased/winh-protected-branch-modal-merged.yml deleted file mode 100644 index 63f1f424a5d..00000000000 --- a/changelogs/unreleased/winh-protected-branch-modal-merged.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Display whether branch has been merged when deleting protected branch -merge_request: 14220 -author: -type: changed diff --git a/changelogs/unreleased/winh-sprintf.yml b/changelogs/unreleased/winh-sprintf.yml deleted file mode 100644 index f8ae5932ae4..00000000000 --- a/changelogs/unreleased/winh-sprintf.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Add basic sprintf implementation to JavaScript -merge_request: 14506 -author: -type: other diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md index 17839cbaef1..73568757aaa 100644 --- a/doc/ci/variables/README.md +++ b/doc/ci/variables/README.md @@ -43,6 +43,7 @@ future GitLab releases.** | **CI_COMMIT_TAG** | 9.0 | 0.5 | The commit tag name. Present only when building tags. | | **CI_CONFIG_PATH** | 9.4 | 0.5 | The path to CI config file. Defaults to `.gitlab-ci.yml` | | **CI_DEBUG_TRACE** | all | 1.7 | Whether [debug tracing](#debug-tracing) is enabled | +| **CI_DISPOSABLE_ENVIRONMENT** | all | 10.1 | Mark that job is executed in a disposable environment (something that is created only for this job and disposed of/destroyed after the execution - all executors except `shell` and `ssh`). If the environment is disposable, it is set to true, otherwise it is not defined at all. | | **CI_ENVIRONMENT_NAME** | 8.15 | all | The name of the environment for this job | | **CI_ENVIRONMENT_SLUG** | 8.15 | all | A simplified version of the environment name, suitable for inclusion in DNS, URLs, Kubernetes labels, etc. | | **CI_ENVIRONMENT_URL** | 9.3 | all | The URL of the environment for this job | @@ -73,6 +74,7 @@ future GitLab releases.** | **CI_SERVER_NAME** | all | all | The name of CI server that is used to coordinate jobs | | **CI_SERVER_REVISION** | all | all | GitLab revision that is used to schedule jobs | | **CI_SERVER_VERSION** | all | all | GitLab version that is used to schedule jobs | +| **CI_SHARED_ENVIRONMENT** | all | 10.1 | Mark that job is executed in a shared environment (something that is persisted across CI invocations like `shell` or `ssh` executor). If the environment is shared, it is set to true, otherwise it is not defined at all. | | **ARTIFACT_DOWNLOAD_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to download artifacts running a job | | **GET_SOURCES_ATTEMPTS** | 8.15 | 1.9 | Number of attempts to fetch sources running a job | | **GITLAB_CI** | all | all | Mark that job is executed in GitLab CI environment | diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md index 613423dbd9a..7ddd02e6c73 100644 --- a/doc/development/testing_guide/best_practices.md +++ b/doc/development/testing_guide/best_practices.md @@ -35,6 +35,8 @@ Here are some things to keep in mind regarding test performance: [Gotchas](../gotchas.md#dont-assert-against-the-absolute-value-of-a-sequence-generated-attribute)). - Don't supply the `:each` argument to hooks since it's the default. - On `before` and `after` hooks, prefer it scoped to `:context` over `:all` +- When using `evaluate_script("$('.js-foo').testSomething()")` (or `execute_script`) which acts on a given element, + use a Capyabara matcher beforehand (e.g. `find('.js-foo')`) to ensure the element actually exists. [four-phase-test]: https://robots.thoughtbot.com/four-phase-test diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md new file mode 100644 index 00000000000..7ab56c89014 --- /dev/null +++ b/doc/policy/maintenance.md @@ -0,0 +1,81 @@ +# GitLab Maintenance Policy + +## Versioning + +GitLab follows the [Semantic Versioning](http://semver.org/) for its releases: +`(Major).(Minor).(Patch)` in a [pragmatic way]. + +- **Major version**: Whenever there is something significant or any backwards + incompatible changes are introduced to the public API. +- **Minor version**: When new, backwards compatible functionality is introduced + to the public API or a minor feature is introduced, or when a set of smaller + features is rolled out. +- **Patch number**: When backwards compatible bug fixes are introduced that fix + incorrect behavior. + +For example, for GitLab version 10.5.7: + +* `10` represents major version +* `5` represents minor version +* `7` represents patch number + +## Security releases + +The current stable release will receive security patches and bug fixes +(eg. `8.9.0` -> `8.9.1`). + +Feature releases will mark the next supported stable +release where the minor version is increased numerically by increments of one +(eg. `8.9 -> 8.10`). + +Our current policy is to support one stable release at any given time. +For medium-level security issues, we may consider backporting to the previous two +monthly releases. + +For very serious security issues, there is [precedent](https://about.gitlab.com/2016/05/02/cve-2016-4340-patches/) +to backport security fixes to even more monthly releases of GitLab. This decision +is made on a case-by-case basis. + +## Version support + +We encourage everyone to run the latest stable release to ensure that you can +easily upgrade to the most secure and feature-rich GitLab experience. In order +to make sure you can easily run the most recent stable release, we are working +hard to keep the update process simple and reliable. + +If you are unable to follow our monthly release cycle, there are a couple of +cases you need to consider. + +It is considered safe to jump between patch versions and minor versions within +one major version. For example, it is safe to: + +* Upgrade the patch version: + * `8.9.0` -> `8.9.7` + * `8.9.0` -> `8.9.1` + * `8.9.2` -> `8.9.6` +* Upgrade the minor version: + * `8.9.4` -> `8.12.3` + * `9.2.3` -> `9.5.5` + +Upgrading the major version requires more attention. +We cannot guarantee that upgrading between major versions will be seamless. As previously mentioned, major versions are reserved for backwards incompatible changes. + +We recommend that you first upgrade to the latest available minor version within +your major version. By doing this, you can address any deprecation messages +that could possibly change behaviour in the next major release. + +Please see the table below for some examples: + +| Latest stable version | Your version | Recommended upgrade path | Note | +| -------------- | ------------ | ------------------------ | ---------------- | +| 9.4.5 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.4.5` | `8.17.7` is the last version in version `8` | +| 10.1.4 | 8.13.4 | `8.13.4` -> `8.17.7` -> `9.5.8` -> `10.1.4` | `8.17.7` is the last version in version `8`, `9.5.8` is the last version in version `9` | +| + +More information about the release procedures can be found in our +[release-tools documentation][rel]. You may also want to read our +[Responsible Disclosure Policy][disclosure]. + +[rel]: https://gitlab.com/gitlab-org/release-tools/blob/master/doc/ +[disclosure]: https://about.gitlab.com/disclosure/ +[pragmatic way]: https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e diff --git a/doc/system_hooks/system_hooks.md b/doc/system_hooks/system_hooks.md index 0399ebec86a..a45a4eb9e49 100644 --- a/doc/system_hooks/system_hooks.md +++ b/doc/system_hooks/system_hooks.md @@ -2,6 +2,8 @@ Your GitLab instance can perform HTTP POST requests on the following events: `project_create`, `project_destroy`, `project_rename`, `project_transfer`, `project_update`, `user_add_to_team`, `user_remove_from_team`, `user_create`, `user_destroy`, `key_create`, `key_destroy`, `group_create`, `group_destroy`, `user_add_to_group` and `user_remove_from_group`. +The triggers for most of these are self-explanatory, but `project_update` and `project_rename` deserve some clarification: `project_update` is fired any time an attribute of a project is changed (name, description, tags, etc.) *unless* the `path` attribute is also changed. In that case, a `project_rename` is triggered instead (so that, for instance, if all you care about is the repo URL, you can just listen for `project_rename`). + System hooks can be used, e.g. for logging or changing information in a LDAP server. > **Note:** diff --git a/features/steps/project/issues/filter_labels.rb b/features/steps/project/issues/filter_labels.rb index d34fa694789..b467af53c98 100644 --- a/features/steps/project/issues/filter_labels.rb +++ b/features/steps/project/issues/filter_labels.rb @@ -28,12 +28,6 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps end end - step 'I click link "bug"' do - page.find('.js-label-select', visible: true).click - sleep 0.5 - execute_script("$('.dropdown-menu-labels li:contains(\"bug\") a').click()") - end - step 'I click "dropdown close button"' do page.first('.labels-filter .dropdown-title .dropdown-menu-close-icon').click sleep 2 diff --git a/features/steps/project/source/browse_files.rb b/features/steps/project/source/browse_files.rb index 621cae5d80d..6e04f09f322 100644 --- a/features/steps/project/source/browse_files.rb +++ b/features/steps/project/source/browse_files.rb @@ -46,10 +46,6 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps expect(page).to have_content new_gitignore_content end - step 'I should see its content with new lines preserved at end of file' do - expect(evaluate_script('ace.edit("editor").getValue()')).to eq "Sample\n\n\n" - end - step 'I click link "Raw"' do click_link 'Open raw' end @@ -70,20 +66,11 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps click_link 'Fork' end - step 'I can edit code' do - set_new_content - expect(evaluate_script('ace.edit("editor").getValue()')).to eq new_gitignore_content - end - step 'I edit code' do expect(page).to have_selector('.file-editor') set_new_content end - step 'I edit code with new lines at end of file' do - execute_script('ace.edit("editor").setValue("Sample\n\n\n")') - end - step 'I fill the new file name' do fill_in :file_name, with: new_file_name end @@ -395,6 +382,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps private def set_new_content + find('#editor') execute_script("ace.edit('editor').setValue('#{new_gitignore_content}')") end diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb index 092e82bd4d1..05aa79dc160 100644 --- a/lib/backup/manager.rb +++ b/lib/backup/manager.rb @@ -137,10 +137,12 @@ module Backup # restoring mismatching backups can lead to unexpected problems if settings[:gitlab_version] != Gitlab::VERSION - $progress.puts 'GitLab version mismatch:'.color(:red) - $progress.puts " Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup!".color(:red) - $progress.puts ' Please switch to the following version and try again:'.color(:red) - $progress.puts " version: #{settings[:gitlab_version]}".color(:red) + $progress.puts(<<~HEREDOC.color(:red)) + GitLab version mismatch: + Your current GitLab version (#{Gitlab::VERSION}) differs from the GitLab version in the backup! + Please switch to the following version and try again: + version: #{settings[:gitlab_version]} + HEREDOC $progress.puts $progress.puts "Hint: git checkout v#{settings[:gitlab_version]}" exit 1 diff --git a/lib/github/import.rb b/lib/github/import.rb index 55f8387f27a..76612799412 100644 --- a/lib/github/import.rb +++ b/lib/github/import.rb @@ -74,7 +74,7 @@ module Github def fetch_wiki_repository return if project.wiki.repository_exists? - wiki_path = "#{project.disk_path}.wiki" + wiki_path = project.wiki.disk_path gitlab_shell.import_repository(project.repository_storage_path, wiki_path, wiki_url) rescue Gitlab::Shell::Error => e # GitHub error message when the wiki repo has not been created, diff --git a/lib/gitlab/github_import/wiki_formatter.rb b/lib/gitlab/github_import/wiki_formatter.rb index 0396122eeb9..ca8d96f5650 100644 --- a/lib/gitlab/github_import/wiki_formatter.rb +++ b/lib/gitlab/github_import/wiki_formatter.rb @@ -8,7 +8,7 @@ module Gitlab end def disk_path - "#{project.disk_path}.wiki" + project.wiki.disk_path end def import_url diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index 59a6cfbf4f5..0a3a0f7da18 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/spec/controllers/application_controller_spec.rb @@ -221,6 +221,20 @@ describe ApplicationController do end end + describe '#set_page_title_header' do + let(:controller) { described_class.new } + + it 'URI encodes UTF-8 characters in the title' do + response = double(headers: {}) + allow_any_instance_of(PageLayoutHelper).to receive(:page_title).and_return('€100 · GitLab') + allow(controller).to receive(:response).and_return(response) + + controller.send(:set_page_title_header) + + expect(response.headers['Page-Title']).to eq('%E2%82%AC100%20%C2%B7%20GitLab') + end + end + context 'two-factor authentication' do let(:controller) { described_class.new } diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index e7631d4d709..5036c1d2226 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -32,6 +32,31 @@ describe GroupsController do end end + describe 'GET #show' do + before do + sign_in(user) + project + end + + context 'as html' do + it 'assigns whether or not a group has children' do + get :show, id: group.to_param + + expect(assigns(:has_children)).to be_truthy + end + end + + context 'as atom' do + it 'assigns events for all the projects in the group' do + create(:event, project: project) + + get :show, id: group.to_param, format: :atom + + expect(assigns(:events)).not_to be_empty + end + end + end + describe 'GET #new' do context 'when creating subgroups', :nested_groups do [true, false].each do |can_create_group_status| diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 91c4e5037de..60ed17c0c81 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -171,12 +171,14 @@ describe 'Issue Boards', :js do expect(page).to have_selector('.card', count: 20) expect(page).to have_content('Showing 20 of 58 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") wait_for_requests expect(page).to have_selector('.card', count: 40) expect(page).to have_content('Showing 40 of 58 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") wait_for_requests @@ -449,11 +451,13 @@ describe 'Issue Boards', :js do expect(page).to have_selector('.card', count: 20) expect(page).to have_content('Showing 20 of 51 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") expect(page).to have_selector('.card', count: 40) expect(page).to have_content('Showing 40 of 51 issues') + find('.board .board-list') evaluate_script("document.querySelectorAll('.board .board-list')[1].scrollTop = document.querySelectorAll('.board .board-list')[1].scrollHeight") expect(page).to have_selector('.card', count: 51) diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb index 9accd7bb07c..9bc23baf6cf 100644 --- a/spec/features/ci_lint_spec.rb +++ b/spec/features/ci_lint_spec.rb @@ -10,6 +10,7 @@ describe 'CI Lint', :js do visit ci_lint_path # Ace editor updates a hidden textarea and it happens asynchronously # `sleep 0.1` is actually needed here because of this + find('#ci-editor') execute_script("ace.edit('ci-editor').setValue(" + yaml_content.to_json + ");") sleep 0.1 click_on 'Validate' diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb index 5610894fd9a..a8919976c31 100644 --- a/spec/features/dashboard/issues_spec.rb +++ b/spec/features/dashboard/issues_spec.rb @@ -87,8 +87,10 @@ RSpec.describe 'Dashboard Issues' do project_path = "/#{project.path_with_namespace}" project_json = { name: project.name_with_namespace, url: project_path }.to_json - # similate selection, and prevent overlap by dropdown menu + # simulate selection, and prevent overlap by dropdown menu + first('.project-item-select', visible: false) execute_script("$('.project-item-select').val('#{project_json}').trigger('change');") + find('#select2-drop-mask', visible: false) execute_script("$('#select2-drop-mask').remove();") find('.new-project-item-link').trigger('click') diff --git a/spec/features/issues/issue_detail_spec.rb b/spec/features/issues/issue_detail_spec.rb index c0c396af93f..6fbee0ebcb5 100644 --- a/spec/features/issues/issue_detail_spec.rb +++ b/spec/features/issues/issue_detail_spec.rb @@ -25,7 +25,7 @@ feature 'Issue Detail', :js do wait_for_requests click_link 'Edit' - fill_in 'issue-title', with: 'issue title' + fill_in 'issuable-title', with: 'issue title' click_button 'Save' Users::DestroyService.new(user).execute(user) diff --git a/spec/features/issues/markdown_toolbar_spec.rb b/spec/features/issues/markdown_toolbar_spec.rb index 6869c2c869d..fee8fd9b365 100644 --- a/spec/features/issues/markdown_toolbar_spec.rb +++ b/spec/features/issues/markdown_toolbar_spec.rb @@ -16,6 +16,7 @@ feature 'Issue markdown toolbar', :js do find('#note-body').native.send_key(:enter) find('#note-body').native.send_keys('bold') + find('.js-main-target-form #note-body') page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 9)') first('.toolbar-btn').click @@ -28,6 +29,7 @@ feature 'Issue markdown toolbar', :js do find('#note-body').native.send_key(:enter) find('#note-body').native.send_keys('underline') + find('.js-main-target-form #note-body') page.evaluate_script('document.querySelectorAll(".js-main-target-form #note-body")[0].setSelectionRange(4, 50)') find('.toolbar-btn:nth-child(2)').click diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index b0432ed8fc6..ba976bc7216 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -60,12 +60,14 @@ feature 'Merge request conflict resolution', :js do within find('.files-wrapper .diff-file', text: 'files/ruby/popen.rb') do click_button 'Edit inline' wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("One morning");') end within find('.files-wrapper .diff-file', text: 'files/ruby/regex.rb') do click_button 'Edit inline' wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[1]).setValue("Gregor Samsa woke from troubled dreams");') end @@ -139,6 +141,7 @@ feature 'Merge request conflict resolution', :js do it 'conflicts are resolved in Edit inline mode' do within find('.files-wrapper .diff-file', text: 'files/markdown/ruby-style-guide.md') do wait_for_requests + find('.files-wrapper .diff-file pre') execute_script('ace.edit($(".files-wrapper .diff-file pre")[0]).setValue("Gregor Samsa woke from troubled dreams");') end diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb index 4538555c168..4362f8b3fcc 100644 --- a/spec/features/merge_requests/edit_mr_spec.rb +++ b/spec/features/merge_requests/edit_mr_spec.rb @@ -66,6 +66,7 @@ feature 'Edit Merge Request' do end def get_textarea_height + find('#merge_request_description') page.evaluate_script('document.getElementById("merge_request_description").offsetHeight') end end diff --git a/spec/features/merge_requests/mini_pipeline_graph_spec.rb b/spec/features/merge_requests/mini_pipeline_graph_spec.rb index dcc70338d7f..bf21a719901 100644 --- a/spec/features/merge_requests/mini_pipeline_graph_spec.rb +++ b/spec/features/merge_requests/mini_pipeline_graph_spec.rb @@ -52,10 +52,12 @@ feature 'Mini Pipeline Graph', :js do end it 'should expand when hovered' do + find('.mini-pipeline-graph-dropdown-toggle') before_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();") toggle.hover + find('.mini-pipeline-graph-dropdown-toggle') after_width = evaluate_script("$('.mini-pipeline-graph-dropdown-toggle:visible').outerWidth();") expect(before_width).to be < after_width diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 6c625ed17aa..965028a6f90 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -20,6 +20,7 @@ feature 'Editing file blob', :js do def edit_and_commit wait_for_requests find('.js-edit-blob').click + find('#editor') execute_script('ace.edit("editor").setValue("class NextFeature\nend\n")') click_button 'Commit changes' end diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb index 9f67216705d..a012db8fd27 100644 --- a/spec/features/projects/issuable_templates_spec.rb +++ b/spec/features/projects/issuable_templates_spec.rb @@ -35,7 +35,7 @@ feature 'issuable templates', :js do page.within('.content .issuable-actions') do click_on 'Edit' end - fill_in :'issue-title', with: 'test issue title' + fill_in :'issuable-title', with: 'test issue title' end scenario 'user selects "bug" template' do @@ -80,7 +80,7 @@ feature 'issuable templates', :js do page.within('.content .issuable-actions') do click_on 'Edit' end - fill_in :'issue-title', with: 'test issue title' + fill_in :'issuable-title', with: 'test issue title' fill_in :'issue-description', with: prior_description end diff --git a/spec/features/projects/user_creates_files_spec.rb b/spec/features/projects/user_creates_files_spec.rb index cbe70a93942..d84b91ddc32 100644 --- a/spec/features/projects/user_creates_files_spec.rb +++ b/spec/features/projects/user_creates_files_spec.rb @@ -60,6 +60,7 @@ describe 'User creates files' do end it 'creates and commit a new file', :js do + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -75,6 +76,7 @@ describe 'User creates files' do end it 'creates and commit a new file with new lines at the end of file', :js do + find('#editor') execute_script('ace.edit("editor").setValue("Sample\n\n\n")') fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -86,6 +88,7 @@ describe 'User creates files' do find('.js-edit-blob').click + find('#editor') expect(evaluate_script('ace.edit("editor").getValue()')).to eq("Sample\n\n\n") end @@ -94,6 +97,7 @@ describe 'User creates files' do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -108,6 +112,7 @@ describe 'User creates files' do it 'creates and commit a new file specifying a new branch', :js do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') fill_in(:commit_message, with: 'New commit message', visible: true) @@ -136,6 +141,7 @@ describe 'User creates files' do expect(page).to have_selector('.file-editor') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:file_name, with: 'not_a_file.md') diff --git a/spec/features/projects/user_edits_files_spec.rb b/spec/features/projects/user_edits_files_spec.rb index e8d83a661d4..d26ee653415 100644 --- a/spec/features/projects/user_edits_files_spec.rb +++ b/spec/features/projects/user_edits_files_spec.rb @@ -23,6 +23,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca') @@ -40,6 +41,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -57,6 +59,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) fill_in(:branch_name, with: 'new_branch_name', visible: true) @@ -74,6 +77,7 @@ describe 'User edits files' do find('.js-edit-blob').click find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") click_link('Preview changes') @@ -103,6 +107,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca') @@ -119,6 +124,7 @@ describe 'User edits files' do find('.file-editor', match: :first) + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'New commit message', visible: true) click_button('Commit changes') @@ -145,6 +151,7 @@ describe 'User edits files' do expect(page).not_to have_link('Fork') expect(page).not_to have_button('Cancel') + find('#editor') execute_script("ace.edit('editor').setValue('*.rbca')") fill_in(:commit_message, with: 'Another commit', visible: true) click_button('Commit changes') diff --git a/spec/javascripts/repo/components/repo_file_spec.js b/spec/javascripts/repo/components/repo_file_spec.js index 334bf0997ca..107f6797f8a 100644 --- a/spec/javascripts/repo/components/repo_file_spec.js +++ b/spec/javascripts/repo/components/repo_file_spec.js @@ -93,6 +93,32 @@ describe('RepoFile', () => { expect(vm.linkClicked).toHaveBeenCalledWith(vm.file); }); + describe('submodule', () => { + let f; + let vm; + + beforeEach(() => { + f = file('submodule name', '123456789'); + f.type = 'submodule'; + + vm = createComponent({ + file: f, + }); + }); + + afterEach(() => { + vm.$destroy(); + }); + + it('renders submodule short ID', () => { + expect(vm.$el.querySelector('.commit-sha').textContent.trim()).toBe('12345678'); + }); + + it('renders ID next to submodule name', () => { + expect(vm.$el.querySelector('td').textContent.replace(/\s+/g, ' ')).toContain('submodule name @ 12345678'); + }); + }); + describe('methods', () => { describe('linkClicked', () => { it('$emits fileNameClicked with file obj', () => { diff --git a/spec/javascripts/repo/components/repo_sidebar_spec.js b/spec/javascripts/repo/components/repo_sidebar_spec.js index 61283da8257..148f275e03d 100644 --- a/spec/javascripts/repo/components/repo_sidebar_spec.js +++ b/spec/javascripts/repo/components/repo_sidebar_spec.js @@ -117,6 +117,21 @@ describe('RepoSidebar', () => { expect(Helper.setDirectoryToClosed).toHaveBeenCalledWith(RepoStore.files[0]); }); + + describe('submodule', () => { + it('opens submodule project URL', () => { + spyOn(gl.utils, 'visitUrl'); + + const f = file(); + f.type = 'submodule'; + + vm = createComponent(); + + vm.fileClicked(f); + + expect(gl.utils.visitUrl).toHaveBeenCalledWith('url'); + }); + }); }); describe('goToPreviousDirectoryClicked', () => { diff --git a/spec/javascripts/repo/mock_data.js b/spec/javascripts/repo/mock_data.js index 836b867205e..71e275caf09 100644 --- a/spec/javascripts/repo/mock_data.js +++ b/spec/javascripts/repo/mock_data.js @@ -1,13 +1,14 @@ import RepoHelper from '~/repo/helpers/repo_helper'; // eslint-disable-next-line import/prefer-default-export -export const file = (name = 'name') => RepoHelper.serializeRepoEntity('blob', { +export const file = (name = 'name', id = name) => RepoHelper.serializeRepoEntity('blob', { + id, icon: 'icon', url: 'url', name, last_commit: { id: '123', message: 'test', - committed_date: '', + committed_date: new Date().toISOString(), }, }); diff --git a/spec/lib/gitlab/current_settings_spec.rb b/spec/lib/gitlab/current_settings_spec.rb index d57ffcae8e1..492659a82b0 100644 --- a/spec/lib/gitlab/current_settings_spec.rb +++ b/spec/lib/gitlab/current_settings_spec.rb @@ -21,7 +21,7 @@ describe Gitlab::CurrentSettings do it 'falls back to DB if Redis returns an empty value' do expect(ApplicationSetting).to receive(:cached).and_return(nil) - expect(ApplicationSetting).to receive(:last).and_call_original + expect(ApplicationSetting).to receive(:last).and_call_original.twice expect(current_application_settings).to be_a(ApplicationSetting) end diff --git a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb index fcd90fab547..2662cc20b32 100644 --- a/spec/lib/gitlab/github_import/wiki_formatter_spec.rb +++ b/spec/lib/gitlab/github_import/wiki_formatter_spec.rb @@ -11,7 +11,7 @@ describe Gitlab::GithubImport::WikiFormatter do describe '#disk_path' do it 'appends .wiki to project path' do - expect(wiki.disk_path).to eq project.disk_path + '.wiki' + expect(wiki.disk_path).to eq project.wiki.disk_path end end diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb index 6945c90cb9b..30495fd4f5e 100644 --- a/spec/models/application_setting_spec.rb +++ b/spec/models/application_setting_spec.rb @@ -220,6 +220,21 @@ describe ApplicationSetting do expect(described_class.current).to eq(:last) end end + + context 'when an ApplicationSetting is not yet present' do + it 'does not cache nil object' do + # when missing settings a nil object is returned, but not cached + allow(described_class).to receive(:last).and_return(nil).twice + expect(described_class.current).to be_nil + + # when the settings are set the method returns a valid object + allow(described_class).to receive(:last).and_return(:last) + expect(described_class.current).to eq(:last) + + # subsequent calls get everything from cache + expect(described_class.current).to eq(:last) + end + end end context 'restrict creating duplicates' do diff --git a/spec/models/ci/artifact_blob_spec.rb b/spec/models/ci/artifact_blob_spec.rb index d5ba088af53..4e72d9d748e 100644 --- a/spec/models/ci/artifact_blob_spec.rb +++ b/spec/models/ci/artifact_blob_spec.rb @@ -56,15 +56,14 @@ describe Ci::ArtifactBlob do end context 'txt extensions' do - let(:entry) { build.artifacts_metadata_entry('other_artifacts_0.1.2/doc_sample.txt') } + let(:path) { 'other_artifacts_0.1.2/doc_sample.txt' } + let(:entry) { build.artifacts_metadata_entry(path) } it 'returns a URL' do url = subject.external_url(build.project, build) expect(url).not_to be_nil - expect(url).to start_with("http") - expect(url).to match Gitlab.config.pages.host - expect(url).to end_with(entry.path) + expect(url).to eq("http://#{project.namespace.path}.#{Gitlab.config.pages.host}/-/#{project.path}/-/jobs/#{build.id}/artifacts/#{path}") end end end diff --git a/spec/support/features/discussion_comments_shared_example.rb b/spec/support/features/discussion_comments_shared_example.rb index 9f05cabf7ae..7132b9cd221 100644 --- a/spec/support/features/discussion_comments_shared_example.rb +++ b/spec/support/features/discussion_comments_shared_example.rb @@ -121,14 +121,31 @@ shared_examples 'discussion comments' do |resource_name| end end - it 'clicking "Start discussion" will post a discussion' do - find(submit_selector).click + describe 'creating a discussion' do + before do + find(submit_selector).click + find(comments_selector, match: :first) + end + + it 'clicking "Start discussion" will post a discussion' do + new_comment = all(comments_selector).last + + expect(new_comment).to have_content 'a' + expect(new_comment).to have_selector '.discussion' + end + + if resource_name == 'merge request' + it 'shows resolved discussion when toggled' do + click_button "Resolve discussion" + + expect(page).to have_selector('.note-row-1', visible: true) - find(comments_selector, match: :first) - new_comment = all(comments_selector).last + refresh + click_button "Toggle discussion" - expect(new_comment).to have_content 'a' - expect(new_comment).to have_selector '.discussion' + expect(page).to have_selector('.note-row-1', visible: true) + end + end end if resource_name == 'issue' diff --git a/spec/support/select2_helper.rb b/spec/support/select2_helper.rb index 6b1853c2364..55da961e173 100644 --- a/spec/support/select2_helper.rb +++ b/spec/support/select2_helper.rb @@ -16,6 +16,7 @@ module Select2Helper selector = options.fetch(:from) + first(selector, visible: false) if options[:multiple] execute_script("$('#{selector}').select2('val', ['#{value}']).trigger('change');") else |