Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix-popover-header-sizefix-popover-header-size | Clement Ho | 2018-12-28 | 1313 | -9717/+15706 |
|\ | |||||
| * | Merge branch 'docs/fix-anchor-link' into 'master' | Mike Lewis | 2018-12-28 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix docs anchor link | Achilleas Pipinellis | 2018-12-27 | 1 | -1/+1 |
| * | | Merge branch 'fj-44679-skip-per-commit-validations' into 'master' | Douwe Maan | 2018-12-28 | 7 | -16/+90 |
| |\ \ | |||||
| | * | | Skip per-commit validations which have already passed on another change/branch | Francisco Javier López | 2018-12-28 | 7 | -16/+90 |
| |/ / | |||||
| * | | Merge branch '51970-correct-ordering-of-metrics' into 'master' | Kamil Trzciński | 2018-12-28 | 6 | -28/+140 |
| |\ \ | |||||
| | * | | Correct ordering of metrics | rpereira2 | 2018-12-21 | 6 | -28/+140 |
| * | | | Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master' | Douwe Maan | 2018-12-28 | 35 | -154/+298 |
| |\ \ \ | |||||
| | * | | | Fixing image lfs bug and also displaying text lfs | Francisco Javier López | 2018-12-27 | 35 | -154/+298 |
| * | | | | Merge branch 'ci-dropdown-hidden-bug' into 'master' | Kushal Pandya | 2018-12-28 | 2 | -1/+5 |
| |\ \ \ \ | |||||
| | * | | | | Don't hide CI dropdown behind diff summary | gfyoung | 2018-12-28 | 2 | -1/+5 |
| * | | | | | Merge branch 'allow_collaboration_status_work' into 'master' | Kushal Pandya | 2018-12-28 | 3 | -1/+58 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Add changelog item to resolved issue. [skip ci] | Harry Kiselev | 2018-12-28 | 1 | -0/+5 |
| | * | | | | Move merge request collaboration message into a constant. | Harry Kiselev | 2018-12-27 | 1 | -3/+5 |
| | * | | | | Update condition to visibility collaboration status text, #44642. | Harry Kiselev | 2018-12-25 | 2 | -1/+51 |
| * | | | | | Merge branch 'dm-lock-version-null' into 'master' | Sean McGivern | 2018-12-28 | 4 | -10/+55 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix spec that depended on 0 lock_version being unsupported | Douwe Maan | 2018-12-27 | 1 | -1/+3 |
| | * | | | | | Support both 0 and NULL lock_versions | Douwe Maan | 2018-12-27 | 2 | -6/+46 |
| | * | | | | | Make it clear that monkey patch is no longer needed in Rails 5.1 | Douwe Maan | 2018-12-27 | 2 | -3/+6 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch 'mc-add-stub-methods-into-spec-kubernetes-helper' into 'master' | Sean McGivern | 2018-12-28 | 1 | -0/+20 |
| |\ \ \ \ \ | |||||
| | * | | | | | Add kubeclients stub methods | Mayra Cabrera | 2018-12-27 | 1 | -0/+20 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'sh-fix-branches-api-timeout' into 'master' | Sean McGivern | 2018-12-28 | 3 | -2/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix timeout issues retrieving branches via API | Stan Hu | 2018-12-27 | 3 | -2/+19 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'pipeline-labels' into 'master' | Stan Hu | 2018-12-27 | 2 | -2/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added missing colons near titles. | Alexander Kutelev | 2018-12-25 | 2 | -2/+5 |
| | | |/ / / | | |/| | | | |||||
| * | | | | | Merge branch '55669-redesign-project-lists-ui-further-improvements' into 'mas... | Kushal Pandya | 2018-12-27 | 3 | -4/+8 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add UI improvements to redesigned project list | Martin Wortschack | 2018-12-25 | 3 | -4/+8 |
| * | | | | | Merge branch 'fj-remove-workhorse-set-content-type-feature-flag' into 'master' | Douwe Maan | 2018-12-27 | 7 | -242/+46 |
| |\ \ \ \ \ | |||||
| | * | | | | | Removing workhorse_set_content_type feature flag | Francisco Javier López | 2018-12-19 | 7 | -242/+46 |
| * | | | | | | Merge branch 'sh-use-system-path-for-appearance-logos' into 'master' | Douwe Maan | 2018-12-27 | 7 | -7/+70 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Use header, favicon, and header_logo path in appearances admin form | Stan Hu | 2018-12-25 | 1 | -3/+3 |
| | * | | | | | | Use system paths for appearance logos | Stan Hu | 2018-12-25 | 6 | -4/+67 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master' | Douwe Maan | 2018-12-27 | 13 | -4/+516 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Cache diff highlight in discussions | Oswaldo Ferreira | 2018-12-21 | 13 | -4/+516 |
| * | | | | | | | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma... | Kamil Trzciński | 2018-12-27 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Handle nil terminals in Clusters::Platforms::Kubernetes | Rémy Coutable | 2018-12-19 | 2 | -2/+3 |
| * | | | | | | | | Merge branch '53907-improve-milestone-links' into 'master' | Kamil Trzciński | 2018-12-27 | 4 | -16/+30 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add % prefix to milestone reference link text | Heinrich Lee Yu | 2018-12-21 | 4 | -16/+30 |
| * | | | | | | | | | Merge branch 'gt-reorder-group-sidebar-menu-items' into 'master' | Sean McGivern | 2018-12-27 | 2 | -13/+18 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Reorder sidebar menu item for group clusters | George Tsiolis | 2018-12-22 | 2 | -13/+18 |
| * | | | | | | | | | | Merge branch 'sh-bump-carrierwave-1.3.0' into 'master' | Sean McGivern | 2018-12-27 | 3 | -48/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Bump CarrierWave to 1.3.0 and remove monkey patches | Stan Hu | 2018-12-24 | 3 | -48/+3 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch '54953-error-500-viewing-merge-request-due-to-nil-commit_email_h... | Stan Hu | 2018-12-27 | 8 | -59/+96 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m... | Lin Jen-Shin | 2018-12-26 | 591 | -2931/+4396 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Simplify spec/lib/gitlab/current_settings_spec.rb a bit | Rémy Coutable | 2018-12-19 | 1 | -3/+3 |
| | * | | | | | | | | | | Make sure we clear the application settings after | Lin Jen-Shin | 2018-12-19 | 1 | -0/+2 |
| | * | | | | | | | | | | Fix cacheable_attributes_spec.rb by adding column_names | Lin Jen-Shin | 2018-12-19 | 1 | -2/+6 |
| | * | | | | | | | | | | Use fake application settings for migration tests | Lin Jen-Shin | 2018-12-19 | 2 | -0/+18 |
| | * | | | | | | | | | | Method `create_from_defaults` will never give nil | Lin Jen-Shin | 2018-12-19 | 3 | -15/+9 |
| | * | | | | | | | | | | Move schema aware defaults to build_from_defaults | Lin Jen-Shin | 2018-12-19 | 2 | -9/+7 |