summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into support-gitaly-tlsAhmad Hassan2018-12-17444-3515/+6831
|\
| * Merge branch 'remove-rails4-specific-code' into 'master'Rémy Coutable2018-12-1738-280/+59
| |\
| | * Remove rails4 specific codeJasper Maes2018-12-1638-280/+59
| * | Merge branch 'jramsay/web-terminal' into 'master'Achilleas Pipinellis2018-12-171-2/+3
| |\ \
| | * | Clearly state web terminal is not supported at allJames Ramsay2018-12-141-2/+3
| * | | Merge branch '34758-list-ancestor-clusters' into 'master'Dmitriy Zaporozhets2018-12-1710-6/+314
| |\ \ \
| | * | | Use finder to decide to show note to userThong Kuah2018-12-174-7/+24
| | * | | Check can :read_clusters in finderThong Kuah2018-12-172-3/+25
| | * | | Move code to presenterThong Kuah2018-12-175-110/+168
| | * | | Refactor methods on ClusterHelperMayra Cabrera2018-12-174-58/+68
| | * | | Cleans cluster views a bitMayra Cabrera2018-12-173-2/+6
| | * | | Move group path display logic to helperThong Kuah2018-12-173-6/+98
| | * | | Update link to documentationMike Greiling2018-12-172-0/+10
| | * | | Render group namespaces in clusters indexMike Greiling2018-12-171-0/+6
| | * | | Correctly enable "Add Kubernetes cluster" buttonMike Greiling2018-12-171-2/+5
| | * | | Show clusters of ancestors in cluster list pageThong Kuah2018-12-174-2/+88
| | | |/ | | |/|
| * | | Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master'Tim Zallmann2018-12-172-4/+21
| |\ \ \
| | * | | Add a test for special charactersNatalia Tepluhina2018-12-141-0/+13
| | * | | Pretty print user-popover.vueNatalia Tepluhina2018-12-131-5/+3
| | * | | Prevent escaping in user tooltip Natalia Tepluhina2018-12-131-7/+13
| * | | | Merge branch 'deprecated-positional-seperator-parameter' into 'master'Rémy Coutable2018-12-172-1/+6
| |\ \ \ \
| | * | | | Passing the separator argument as a positional parameter is deprecatedJasper Maes2018-12-142-1/+6
| * | | | | Merge branch 'rubocop-prepend' into 'master'Rémy Coutable2018-12-174-0/+187
| |\ \ \ \ \
| | * | | | | Added Cop for injecting EE modulesYorick Peterse2018-12-134-0/+187
| * | | | | | Merge branch 'rs-prepare-build-parity' into 'master'Rémy Coutable2018-12-171-6/+18
| |\ \ \ \ \ \
| | * | | | | | CE-EE parity for prepare_build scriptRobert Speicher2018-12-131-6/+18
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'docs-registry_s3_chunksize' into 'master'Achilleas Pipinellis2018-12-171-0/+46
| |\ \ \ \ \ \
| | * | | | | | Add Registry S3 chunksize troubleshooting sectionDrew Blessing2018-12-141-0/+46
| * | | | | | | Merge branch 'fix-rspec-offcense' into 'master'Rémy Coutable2018-12-175-19/+8
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Fix RSpec/HookArgument rubocop offenseSemyon Pupkov2018-12-115-19/+8
| * | | | | | | Merge branch '55402-broken-master-karma-test-failing-in-spec-javascripts-boar...53225-rendering-and-usability-problems-with-ie-1153104-redesign-group-overview-ui-mvcStan Hu2018-12-162-3/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Fix broken karma testMartin Wortschack2018-12-152-3/+9
| * | | | | | | | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-159-3/+150
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fix diff table rendering for empty files and improve testsSean Nichols2018-12-132-7/+15
| | * | | | | | | Fix redundant returns in spec fileSean Nichols2018-12-131-3/+3
| | * | | | | | | Add tests and move empty file message into own componentSean Nichols2018-12-135-3/+128
| | * | | | | | | Move empty file message to diff_content componentSean Nichols2018-12-122-2/+2
| | * | | | | | | Update localization filesSean Nichols2018-12-121-0/+3
| | * | | | | | | Fix Prettier formatting and add MR to changelogSean Nichols2018-12-112-4/+2
| | * | | | | | | Display empty files properly on MR diffsSean Nichols2018-12-114-0/+13
| * | | | | | | | Merge branch 'rs-transient-help-page-failure' into 'master'Stan Hu2018-12-154-20/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Resolve transient failure in Help page specRobert Speicher2018-12-141-7/+6
| | * | | | | | | | Use class methods for VersionCheckRobert Speicher2018-12-144-13/+14
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master'Mike Greiling2018-12-148-17/+37
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Set cached MRWidget SHA after rebaseSam Bigelow2018-12-148-17/+37
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'patch-31' into 'master'Achilleas Pipinellis2018-12-141-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed link in doc/ci/yaml/README.mdPhilipp Hasper2018-11-291-1/+1
| * | | | | | | | | Merge branch 'docs/ci-yaml-only-except-complex' into 'master'Achilleas Pipinellis2018-12-141-44/+54
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Refactor the only and except complex sectionAchilleas Pipinellis2018-12-131-44/+54
| * | | | | | | | | | Merge branch 'docs-le-for-pages' into 'master'Achilleas Pipinellis2018-12-143-15/+172
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |