summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Bump Ruby on Rails to 5.0.7.1blackst0ne-bump-rails-cve-2018-16476blackst0ne2018-12-213-4/+27
* Merge branch 'reduce-service-params-diff-with-ce' into 'master'Robert Speicher2018-12-171-1/+5
|\
| * Use the EE version of ServiceParamsRémy Coutable2018-12-171-1/+5
* | Merge branch 'avoid-wrapped-clone-button' into 'master'Mike Greiling2018-12-171-2/+2
|\ \
| * | Re-align project title row and repo button containersAndreas Kämmerle2018-12-141-2/+2
* | | Merge branch '53954-resolved-non-diff-discussions-on-merge-requests-no-longer...Phil Hughes2018-12-173-11/+32
|\ \ \
| * | | Add message saying who resolved nondiff discussionsbigelow2018-12-173-11/+32
* | | | Add new predefined variable CI_COMMIT_SHORT_SHAJason Lenny2018-12-171-0/+1
| |_|/ |/| |
* | | Merge branch 'gt-add-externalized-strings-for-cluster-error-msg' into 'master'Douglas Barbosa Alexandre2018-12-171-3/+3
|\ \ \ | |/ / |/| |
| * | Add externalized strings for clusters error messagesGeorge Tsiolis2018-12-171-3/+3
* | | Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'Douwe Maan2018-12-172-7/+0
|\ \ \
| * | | Remove the project_cleanup feature flagNick Thomas2018-12-152-7/+0
| |/ /
* | | Merge branch 'inline-duplicated-discussions' into 'master'Fatih Acet2018-12-171-1/+1
|\ \ \
| * | | Fixed duplicated inline diff discussionsPhil Hughes2018-12-141-1/+1
* | | | Merge branch 'update-page-filter-path-defaults' into 'master'Rémy Coutable2018-12-178-28/+23
|\ \ \ \
| * | | | Change `page_filter_path` default behaviorHeinrich Lee Yu2018-12-148-28/+23
* | | | | Merge branch 'add-horizontal-whitespace-to-profile-page' into 'master'Kushal Pandya2018-12-171-14/+16
|\ \ \ \ \
| * | | | | Enhance horizontal whitespaceAndreas Kämmerle2018-12-131-14/+16
* | | | | | Merge branch 'remove-rails4-specific-code' into 'master'Rémy Coutable2018-12-178-69/+6
|\ \ \ \ \ \
| * | | | | | Remove rails4 specific codeJasper Maes2018-12-168-69/+6
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '34758-list-ancestor-clusters' into 'master'Dmitriy Zaporozhets2018-12-176-5/+104
|\ \ \ \ \ \
| * | | | | | Use finder to decide to show note to userThong Kuah2018-12-174-7/+24
| * | | | | | Check can :read_clusters in finderThong Kuah2018-12-171-3/+9
| * | | | | | Move code to presenterThong Kuah2018-12-173-37/+43
| * | | | | | Refactor methods on ClusterHelperMayra Cabrera2018-12-173-17/+30
| * | | | | | Cleans cluster views a bitMayra Cabrera2018-12-173-2/+6
| * | | | | | Move group path display logic to helperThong Kuah2018-12-172-6/+23
| * | | | | | Update link to documentationMike Greiling2018-12-171-0/+7
| * | | | | | 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-172-2/+22
| |/ / / / /
* | | | | | Merge branch '55276-encoding-issue-with-the-user-centric-tooltips' into 'master'Tim Zallmann2018-12-171-4/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Pretty print user-popover.vueNatalia Tepluhina2018-12-131-5/+3
| * | | | | Prevent escaping in user tooltip Natalia Tepluhina2018-12-131-7/+13
* | | | | | Merge branch '54786-mr-empty-file-display' into 'master'Nick Thomas2018-12-153-2/+9
|\ \ \ \ \ \
| * | | | | | Fix diff table rendering for empty files and improve testsSean Nichols2018-12-131-2/+2
| * | | | | | Add tests and move empty file message into own componentSean Nichols2018-12-132-2/+7
| * | | | | | Move empty file message to diff_content componentSean Nichols2018-12-122-2/+2
| * | | | | | Fix Prettier formatting and add MR to changelogSean Nichols2018-12-111-3/+1
| * | | | | | Display empty files properly on MR diffsSean Nichols2018-12-112-0/+4
* | | | | | | Merge branch 'rs-transient-help-page-failure' into 'master'Stan Hu2018-12-151-2/+1
|\ \ \ \ \ \ \
| * | | | | | | Use class methods for VersionCheckRobert Speicher2018-12-141-2/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '47052-merge-button-does-not-appear-after-rebase-ing' into 'master'Mike Greiling2018-12-144-6/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Set cached MRWidget SHA after rebaseSam Bigelow2018-12-144-6/+14
* | | | | | | Merge branch 'refactor-ci-pipeline-config-source-enum' into 'master'Kamil Trzciński2018-12-142-5/+11
|\ \ \ \ \ \ \
| * | | | | | | Refactor Ci::Pipeline's config_sources enumYorick Peterse2018-12-132-5/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch '53771-move-cluster-type-description' into 'master'Kamil Trzciński2018-12-142-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Move description of cluster type to presenterThong Kuah2018-12-132-1/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'remove-issue-suggestions-flag' into 'master'Douwe Maan2018-12-144-5/+4
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Enable GraphQL API endpointPhil Hughes2018-12-132-2/+2