diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc0d2b71174..87d73fc0c52 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,11 +49,11 @@ stages: - gitlab-org .tests-metadata-state: &tests-metadata-state - services: [] + <<: *dedicated-runner variables: - SETUP_DB: "false" - USE_BUNDLE_INSTALL: "false" TESTS_METADATA_S3_BUCKET: "gitlab-ce-cache" + before_script: + - source scripts/utils.sh artifacts: expire_in: 31d paths: @@ -80,6 +80,7 @@ stages: .rspec-metadata: &rspec-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -109,16 +110,15 @@ stages: .rspec-metadata-pg: &rspec-metadata-pg <<: *rspec-metadata <<: *use-pg - <<: *except-docs .rspec-metadata-mysql: &rspec-metadata-mysql <<: *rspec-metadata <<: *use-mysql - <<: *except-docs .spinach-metadata: &spinach-metadata <<: *dedicated-runner <<: *pull-cache + <<: *except-docs stage: test script: - JOB_NAME=( $CI_JOB_NAME ) @@ -141,12 +141,10 @@ stages: .spinach-metadata-pg: &spinach-metadata-pg <<: *spinach-metadata <<: *use-pg - <<: *except-docs .spinach-metadata-mysql: &spinach-metadata-mysql <<: *spinach-metadata <<: *use-mysql - <<: *except-docs .only-canonical-masters: &only-canonical-masters only: @@ -157,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 @@ -183,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: @@ -222,7 +212,6 @@ review-docs-cleanup: # Retrieve knapsack and rspec_flaky reports retrieve-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *except-docs stage: prepare cache: @@ -240,7 +229,6 @@ retrieve-tests-metadata: update-tests-metadata: <<: *tests-metadata-state - <<: *dedicated-runner <<: *only-canonical-masters stage: post-test cache: @@ -305,69 +293,69 @@ setup-test-env: - public/assets - tmp/tests -rspec-pg 0 25: *rspec-metadata-pg -rspec-pg 1 25: *rspec-metadata-pg -rspec-pg 2 25: *rspec-metadata-pg -rspec-pg 3 25: *rspec-metadata-pg -rspec-pg 4 25: *rspec-metadata-pg -rspec-pg 5 25: *rspec-metadata-pg -rspec-pg 6 25: *rspec-metadata-pg -rspec-pg 7 25: *rspec-metadata-pg -rspec-pg 8 25: *rspec-metadata-pg -rspec-pg 9 25: *rspec-metadata-pg -rspec-pg 10 25: *rspec-metadata-pg -rspec-pg 11 25: *rspec-metadata-pg -rspec-pg 12 25: *rspec-metadata-pg -rspec-pg 13 25: *rspec-metadata-pg -rspec-pg 14 25: *rspec-metadata-pg -rspec-pg 15 25: *rspec-metadata-pg -rspec-pg 16 25: *rspec-metadata-pg -rspec-pg 17 25: *rspec-metadata-pg -rspec-pg 18 25: *rspec-metadata-pg -rspec-pg 19 25: *rspec-metadata-pg -rspec-pg 20 25: *rspec-metadata-pg -rspec-pg 21 25: *rspec-metadata-pg -rspec-pg 22 25: *rspec-metadata-pg -rspec-pg 23 25: *rspec-metadata-pg -rspec-pg 24 25: *rspec-metadata-pg +rspec-pg 0 26: *rspec-metadata-pg +rspec-pg 1 26: *rspec-metadata-pg +rspec-pg 2 26: *rspec-metadata-pg +rspec-pg 3 26: *rspec-metadata-pg +rspec-pg 4 26: *rspec-metadata-pg +rspec-pg 5 26: *rspec-metadata-pg +rspec-pg 6 26: *rspec-metadata-pg +rspec-pg 7 26: *rspec-metadata-pg +rspec-pg 8 26: *rspec-metadata-pg +rspec-pg 9 26: *rspec-metadata-pg +rspec-pg 10 26: *rspec-metadata-pg +rspec-pg 11 26: *rspec-metadata-pg +rspec-pg 12 26: *rspec-metadata-pg +rspec-pg 13 26: *rspec-metadata-pg +rspec-pg 14 26: *rspec-metadata-pg +rspec-pg 15 26: *rspec-metadata-pg +rspec-pg 16 26: *rspec-metadata-pg +rspec-pg 17 26: *rspec-metadata-pg +rspec-pg 18 26: *rspec-metadata-pg +rspec-pg 19 26: *rspec-metadata-pg +rspec-pg 20 26: *rspec-metadata-pg +rspec-pg 21 26: *rspec-metadata-pg +rspec-pg 22 26: *rspec-metadata-pg +rspec-pg 23 26: *rspec-metadata-pg +rspec-pg 24 26: *rspec-metadata-pg +rspec-pg 25 26: *rspec-metadata-pg -rspec-mysql 0 25: *rspec-metadata-mysql -rspec-mysql 1 25: *rspec-metadata-mysql -rspec-mysql 2 25: *rspec-metadata-mysql -rspec-mysql 3 25: *rspec-metadata-mysql -rspec-mysql 4 25: *rspec-metadata-mysql -rspec-mysql 5 25: *rspec-metadata-mysql -rspec-mysql 6 25: *rspec-metadata-mysql -rspec-mysql 7 25: *rspec-metadata-mysql -rspec-mysql 8 25: *rspec-metadata-mysql -rspec-mysql 9 25: *rspec-metadata-mysql -rspec-mysql 10 25: *rspec-metadata-mysql -rspec-mysql 11 25: *rspec-metadata-mysql -rspec-mysql 12 25: *rspec-metadata-mysql -rspec-mysql 13 25: *rspec-metadata-mysql -rspec-mysql 14 25: *rspec-metadata-mysql -rspec-mysql 15 25: *rspec-metadata-mysql -rspec-mysql 16 25: *rspec-metadata-mysql -rspec-mysql 17 25: *rspec-metadata-mysql -rspec-mysql 18 25: *rspec-metadata-mysql -rspec-mysql 19 25: *rspec-metadata-mysql -rspec-mysql 20 25: *rspec-metadata-mysql -rspec-mysql 21 25: *rspec-metadata-mysql -rspec-mysql 22 25: *rspec-metadata-mysql -rspec-mysql 23 25: *rspec-metadata-mysql -rspec-mysql 24 25: *rspec-metadata-mysql +rspec-mysql 0 26: *rspec-metadata-mysql +rspec-mysql 1 26: *rspec-metadata-mysql +rspec-mysql 2 26: *rspec-metadata-mysql +rspec-mysql 3 26: *rspec-metadata-mysql +rspec-mysql 4 26: *rspec-metadata-mysql +rspec-mysql 5 26: *rspec-metadata-mysql +rspec-mysql 6 26: *rspec-metadata-mysql +rspec-mysql 7 26: *rspec-metadata-mysql +rspec-mysql 8 26: *rspec-metadata-mysql +rspec-mysql 9 26: *rspec-metadata-mysql +rspec-mysql 10 26: *rspec-metadata-mysql +rspec-mysql 11 26: *rspec-metadata-mysql +rspec-mysql 12 26: *rspec-metadata-mysql +rspec-mysql 13 26: *rspec-metadata-mysql +rspec-mysql 14 26: *rspec-metadata-mysql +rspec-mysql 15 26: *rspec-metadata-mysql +rspec-mysql 16 26: *rspec-metadata-mysql +rspec-mysql 17 26: *rspec-metadata-mysql +rspec-mysql 18 26: *rspec-metadata-mysql +rspec-mysql 19 26: *rspec-metadata-mysql +rspec-mysql 20 26: *rspec-metadata-mysql +rspec-mysql 21 26: *rspec-metadata-mysql +rspec-mysql 22 26: *rspec-metadata-mysql +rspec-mysql 23 26: *rspec-metadata-mysql +rspec-mysql 24 26: *rspec-metadata-mysql +rspec-mysql 25 26: *rspec-metadata-mysql -spinach-pg 0 5: *spinach-metadata-pg -spinach-pg 1 5: *spinach-metadata-pg -spinach-pg 2 5: *spinach-metadata-pg -spinach-pg 3 5: *spinach-metadata-pg -spinach-pg 4 5: *spinach-metadata-pg +spinach-pg 0 4: *spinach-metadata-pg +spinach-pg 1 4: *spinach-metadata-pg +spinach-pg 2 4: *spinach-metadata-pg +spinach-pg 3 4: *spinach-metadata-pg -spinach-mysql 0 5: *spinach-metadata-mysql -spinach-mysql 1 5: *spinach-metadata-mysql -spinach-mysql 2 5: *spinach-metadata-mysql -spinach-mysql 3 5: *spinach-metadata-mysql -spinach-mysql 4 5: *spinach-metadata-mysql +spinach-mysql 0 4: *spinach-metadata-mysql +spinach-mysql 1 4: *spinach-metadata-mysql +spinach-mysql 2 4: *spinach-metadata-mysql +spinach-mysql 3 4: *spinach-metadata-mysql # Static analysis jobs .ruby-static-analysis: &ruby-static-analysis 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