summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve the GitHub and Gitea import feature table interfaceimport-go-to-project-ctaLuke Bennett2018-12-2855-208/+1863
* Merge branch 'docs/fix-anchor-link' into 'master'Mike Lewis2018-12-281-1/+1
|\
| * Fix docs anchor linkAchilleas Pipinellis2018-12-271-1/+1
* | Merge branch 'fj-44679-skip-per-commit-validations' into 'master'Douwe Maan2018-12-287-16/+90
|\ \
| * | Skip per-commit validations which have already passed on another change/branchFrancisco Javier López2018-12-287-16/+90
|/ /
* | Merge branch '51970-correct-ordering-of-metrics' into 'master'Kamil Trzciński2018-12-286-28/+140
|\ \
| * | Correct ordering of metricsrpereira22018-12-216-28/+140
* | | Merge branch 'fj-fix-lfs-image-comments-diffs' into 'master'Douwe Maan2018-12-2835-154/+298
|\ \ \
| * | | Fixing image lfs bug and also displaying text lfsFrancisco Javier López2018-12-2735-154/+298
* | | | Merge branch 'ci-dropdown-hidden-bug' into 'master'Kushal Pandya2018-12-282-1/+5
|\ \ \ \
| * | | | Don't hide CI dropdown behind diff summarygfyoung2018-12-282-1/+5
* | | | | Merge branch 'allow_collaboration_status_work' into 'master'Kushal Pandya2018-12-283-1/+58
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add changelog item to resolved issue. [skip ci]Harry Kiselev2018-12-281-0/+5
| * | | | Move merge request collaboration message into a constant.Harry Kiselev2018-12-271-3/+5
| * | | | Update condition to visibility collaboration status text, #44642.Harry Kiselev2018-12-252-1/+51
* | | | | Merge branch 'dm-lock-version-null' into 'master'Sean McGivern2018-12-284-10/+55
|\ \ \ \ \
| * | | | | Fix spec that depended on 0 lock_version being unsupportedDouwe Maan2018-12-271-1/+3
| * | | | | Support both 0 and NULL lock_versionsDouwe Maan2018-12-272-6/+46
| * | | | | Make it clear that monkey patch is no longer needed in Rails 5.1Douwe Maan2018-12-272-3/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'mc-add-stub-methods-into-spec-kubernetes-helper' into 'master'Sean McGivern2018-12-281-0/+20
|\ \ \ \ \
| * | | | | Add kubeclients stub methodsMayra Cabrera2018-12-271-0/+20
| |/ / / /
* | | | | Merge branch 'sh-fix-branches-api-timeout' into 'master'Sean McGivern2018-12-283-2/+19
|\ \ \ \ \
| * | | | | Fix timeout issues retrieving branches via APIStan Hu2018-12-273-2/+19
| |/ / / /
* | | | | Merge branch 'pipeline-labels' into 'master'Stan Hu2018-12-272-2/+5
|\ \ \ \ \
| * | | | | Added missing colons near titles.Alexander Kutelev2018-12-252-2/+5
| | |/ / / | |/| | |
* | | | | Merge branch '55669-redesign-project-lists-ui-further-improvements' into 'mas...Kushal Pandya2018-12-273-4/+8
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add UI improvements to redesigned project listMartin Wortschack2018-12-253-4/+8
* | | | | Merge branch 'fj-remove-workhorse-set-content-type-feature-flag' into 'master'Douwe Maan2018-12-277-242/+46
|\ \ \ \ \
| * | | | | Removing workhorse_set_content_type feature flagFrancisco Javier López2018-12-197-242/+46
* | | | | | Merge branch 'sh-use-system-path-for-appearance-logos' into 'master'Douwe Maan2018-12-277-7/+70
|\ \ \ \ \ \
| * | | | | | Use header, favicon, and header_logo path in appearances admin formStan Hu2018-12-251-3/+3
| * | | | | | Use system paths for appearance logosStan Hu2018-12-256-4/+67
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'osw-cache-discussions-diff-highlighting' into 'master'Douwe Maan2018-12-2713-4/+516
|\ \ \ \ \ \
| * | | | | | Cache diff highlight in discussionsOswaldo Ferreira2018-12-2113-4/+516
* | | | | | | Merge branch '55551-nomethoderror-undefined-method-for-nil-nilclass' into 'ma...Kamil Trzciński2018-12-272-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Handle nil terminals in Clusters::Platforms::KubernetesRémy Coutable2018-12-192-2/+3
* | | | | | | | Merge branch '53907-improve-milestone-links' into 'master'Kamil Trzciński2018-12-274-16/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Add % prefix to milestone reference link textHeinrich Lee Yu2018-12-214-16/+30
* | | | | | | | | Merge branch 'gt-reorder-group-sidebar-menu-items' into 'master'Sean McGivern2018-12-272-13/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Reorder sidebar menu item for group clustersGeorge Tsiolis2018-12-222-13/+18
* | | | | | | | | | Merge branch 'sh-bump-carrierwave-1.3.0' into 'master'Sean McGivern2018-12-273-48/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Bump CarrierWave to 1.3.0 and remove monkey patchesStan Hu2018-12-243-48/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch '54953-error-500-viewing-merge-request-due-to-nil-commit_email_h...Stan Hu2018-12-278-59/+96
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into 54953-error-500-viewing-m...Lin Jen-Shin2018-12-26591-2931/+4396
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify spec/lib/gitlab/current_settings_spec.rb a bitRémy Coutable2018-12-191-3/+3
| * | | | | | | | | | Make sure we clear the application settings afterLin Jen-Shin2018-12-191-0/+2
| * | | | | | | | | | Fix cacheable_attributes_spec.rb by adding column_namesLin Jen-Shin2018-12-191-2/+6
| * | | | | | | | | | Use fake application settings for migration testsLin Jen-Shin2018-12-192-0/+18
| * | | | | | | | | | Method `create_from_defaults` will never give nilLin Jen-Shin2018-12-193-15/+9
| * | | | | | | | | | Move schema aware defaults to build_from_defaultsLin Jen-Shin2018-12-192-9/+7