Skip to content
Snippets Groups Projects

CE upstream

Merged Valery Sizov requested to merge ce_upstream into master

@iamphill Please resolve ASAP app/views/profiles/keys/_key.html.haml

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Phil Hughes Added 1 commit:

    Added 1 commit:

  • Valery Sizov Added 129 commits:

    Added 129 commits:

    • cbfe87b4...808fba83 - 52 commits from branch master
    • 7ea3bbd4 - add bundle clean to upgrade docs
    • d24d806e - Deprecated GitLab CI API clean up - README
    • 616281f6 - Update CI API docs for builds endpoint for runners
    • cf73dc34 - Add CI API prefix to documentation
    • 5b3b4ff6 - Update CI API documentation for runners
    • ec7c6a08 - Remove deprecated CI API docs for commits and projects
    • 74b96326 - Update format of documentation for CI API
    • 4ed40db9 - update slack instructions
    • 9c593a51 - Remove duplicate 'cache_store' configuration in test environment
    • cf232411 - Added Troubleshooting information for most used services.
    • fc90d9e5 - Tell clients/proxies to cache raw blob requests
    • b0adc07b - add link to web hooks
    • b0d24ab1 - Add fields to GET /users/* API endpoints for admins
    • a056dfa9 - Refactor GlobalMilestone queries.
    • 70028d36 - Recator Issues Tab into a custom partial.
    • 37d92d0b - Refactor Merge Requests tab into a custom partial
    • e805becf - Eager load Issues/MRs project for Milestone.
    • 834b5d49 - Refactor Merge Requests tab into a custom partial
    • ed480855 - Refactor Merge Requests tab into a custom partial
    • 32f8fc1f - Refactor Milestone view for Dashboard.
    • e0a18829 - Show project name for Issues tab in Group and Dashboard context.
    • 7cc102a0 - Make Merge Requests tab have the same look as Issues.
    • b6e5de2c - Use the same partial when rendering Issues or Merge Requests.
    • 3c157b6b - Show Project name on Labels tab for Group and Dashboard context.
    • 96058605 - Show some stats about Milestone according to the new UI.
    • 3f2d8248 - Add missing partials!
    • baa782ac - Add some spinach specs.
    • c91554de - Add link with filter by milestone for labels and avatar.
    • 95b06a62 - Updates from last code review.
    • a215e2ee - Revert changes in the Project model
    • 41bc9c46 - Refactor caching code
    • a19b4e75 - make cleanup optional
    • a284d307 - Use Rails etag/cache_control helpers
    • 903aa7c9 - Merge branch 'issue_13621_2' into 'master'
    • 56c4f22c - Remove redundant integration tests
    • 73535b80 - adds language names to projects list github style
    • fe934a2d - adds cache to languages list
    • 85de3f69 - changes if ! to unless and now asks for language instead of languages
    • d9e646a7 - moves method to repository model
    • a14b98f8 - implements project languages saving them onto the database
    • dc31aff3 - removes unused methods that I forgot
    • c2c5572e - adds swp and swo to gitignore and improves migration for project main_language
    • d72e6ad2 - adds tests and fixes some broken code to main language mr
    • 4b3f3167 - implements test to simulate empty repo
    • 93fb4ce2 - removes redundant self
    • 68d6f5bc - fixes typo
    • 337cb452 - removes automatic setting of main_language to project for it to set a main langu…
    • 8039bbf7 - removes the test file of the project spec for invalid method
    • 96c02551 - moves the main_language update logic to git push service
    • 4e8a5343 - add my mr to changelog
    • 49295924 - adds test for git push service for updating the language of the project
    • 406f4a99 - Fixed headers for anchors
    • afb8d76f - Merge branch 'cache-raw-2' into 'master'
    • 2db00dd5 - Merge branch 'rs-redundant-features' into 'master'
    • 9568b4b4 - Document changes to the initial admin password
    • dc473964 - Merge branch 'rs-initial-setup-docs' into 'master'
    • 015d7eea - Merge branch 'doc-troubleshooting' into 'master'
    • 75a67ac0 - Merge branch 'bundle_clean' into 'master'
    • a19a9fab - Merge branch 'doc/ci-api-update' into 'master'
    • 059df225 - Added basic SQL guidelines
    • 36730e8e - Merge branch 'master' into 'master'
    • 6ac68d8c - Remove instance variable @group multiple assignment
    • c74b6098 - Merge branch 'patch-2' into 'master'
    • 149a52b1 - Merge branch 'patch-1' into 'master'
    • f2209c98 - Merge branch 'sql-guide' into 'master'
    • cb5a5ba0 - Cache & flush tag/branch counts
    • 177025b5 - Call the right hooks when removing branches
    • 6857b92f - Added specs for Repository#rm_tag
    • 4ec035b4 - Call the right hooks in Repository#add_tag
    • 590e1b4b - Call after_create_branch in Repository#add_branch
    • c3eb2458 - Merge branch 'remove-duplicate-cache_store-in-test-config' into 'master'
    • 24663e80 - Merge branch 'improve/3102-memoize-group-instance-variable-in-admin-groups-contr…
    • fe9a445f - Merge branch 'evuez/gitlab-ce-add-info-user-api' into 'master'
    • e8cd04e8 - Merge branch 'branch-tag-count-methods' into 'master'
    • 43031a15 - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream
    • 2b3dc28d - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
    • 8f7f1a45 - Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream
  • Author Contributor

    @rdavila Please resolve app/views/projects/milestones/show.html.haml ASAP

  • Valery Sizov Added 1 commit:

    Added 1 commit:

  • Rubén Dávila Added 1 commit:

    Added 1 commit:

  • @vsizov done!, thanks for the heads up.

  • Author Contributor

    Thanks @rdavila

  • Valery Sizov Added 56 commits:

    Added 56 commits:

    • 21a05328 - Security: Fix issue auto closing
    • 97093a52 - Show at most 100 commits in the web UI
    • 5eeea4b7 - Limit the number of commits shown in MRs
    • f943156b - Put 'hidden commits' logic in CommitsHelper
    • 4cb3a4a7 - Remove outdated comment
    • acb21121 - Add option to show archived projects on dahsboard
    • bebf34aa - Make projects sort dropdown shared so it can be reused for other pages
    • 2c431f89 - Add projects list sort dropdown to group page
    • ee0f5bb5 - Add test for archive toggle feature
    • 38984a59 - Show active sorting method for projects list
    • 619321dc - Fix test
    • 62067c5b - Align projects sort checkbox
    • 5a07032d - Merge branch 'security_bug_fix_close_issue' into 'master'
    • 7a311c23 - Updated project list dropdown to use dropdown classes
    • 836d5930 - Remove Snippet#expires_at
    • 82363332 - Finish refactor
    • d51877ca - Change "some commits hidden" message
    • 591bf92c - Fix bug where Bitbucket closed issues were imported as opened
    • f05c2229 - Bump poltergeist to ~> 1.9.0
    • 5b621e1b - Snippet visibility badge spacing
    • 7000e76a - Simplify the various Snippet factories
    • b900304c - Make better use of the visibility_level factory traits
    • 0853628c - Fix URL to upgrader guide
    • c674ffe0 - Merge branch 'improve-archived-projects'
    • bc14d81a - Merge branch 'rs-snippets-dont-expire' into 'master'
    • 68f1535a - Merge branch 'rs-traits-are-good' into 'master'
    • 0f149803 - Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
    • b0b72c3b - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
    • 0ab52373 - Merge branch 'fix/upgrader-docs' into 'master'
    • 9d9d2fbb - Prevent performance issues
    • c666441d - Added main_language to the schema
    • 2af9326c - Merge branch 'update-db-schema' into 'master'
    • 500337c4 - Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master'
    • 640bf8ab - Retry failed tests
    • af434016 - Retry spinach tests
    • 978703ab - Retry apt-get installation and bundle install
    • b651cd22 - Fix script error
    • 9e342fb0 - Destroy all related todos when removing a project
    • 5956ddd8 - Merge branch 'retry-tests' into 'master'
    • 22140ced - Remove invalid todos from database
    • cac83cea - Update CHANGELOG
    • 96d35c59 - Fixed part of the GitPushService specs
    • 53719ecb - Handle permissions for ExternalIssue instances
    • e72ae40c - Merge branch 'rs-bump-poltergeist' into 'master'
    • 5e466627 - Merge branch 'commit-limits' into 'master'
    • 48fc02d2 - Merge branch 'snippet-visibility-spacing' into 'master'
    • e443c7c6 - Add a gemojione:sprite Rake task
    • 7500a12a - Avoid error 500 when todo author was removed
    • b100a9f2 - Update CHANGELOG
    • 00a19f32 - Merge branch 'fix-todos' into 'master'
    • fdfcc1ac - Merge branch 'rs-sprite-task' into 'master'
    • 3da55e37 - Retry bundler and apt-get
    • 8e3485d8 - Merge branch 'fix-git-push-service-specs' into 'master'
    • d9042e8b - Merge branch 'retry-bundle' into 'master'
    • 532815ac - Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream
    • f67d567d - Merge branch 'ce_upstream' of gitlab.com:gitlab-org/gitlab-ee into ce_upstream
  • Valery Sizov Added 2 commits:

    Added 2 commits:

  • Valery Sizov Added 1 commit:

    Added 1 commit:

  • Added 1 commit:

  • Author Contributor

    Thanks @jacobvosmaer ❤️

  • Valery Sizov Status changed to merged

    Status changed to merged

  • Valery Sizov mentioned in commit 8a0ae304

    mentioned in commit 8a0ae304

  • Patricio Cano mentioned in commit 35b87298

    mentioned in commit 35b87298

  • Patricio Cano Mentioned in commit 35b87298

    Mentioned in commit 35b87298

Please register or sign in to reply
Loading