summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into object-storage-ee-to-ce-bac...object-storage-ee-to-ce-backportKamil Trzciński2018-02-28131-568/+669
|\
| * Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' i...Grzegorz Bizon2018-02-273-8/+6
| |\
| | * Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-273-8/+6
| * | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-271-1/+0
| |\ \
| | * \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-262-26/+28
| | |\ \
| | * | | Remove commit_pipelines webpack entry pointClement Ho2018-02-261-1/+0
| * | | | Merge branch '43315-gpg-popover' into 'master'Phil Hughes2018-02-271-1/+1
| |\ \ \ \
| | * | | | Add missing class to parent element and remove extra CSS43315-gpg-popoverFilipa Lacerda2018-02-261-1/+1
| * | | | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-262-26/+28
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ...Mayra Cabrera2018-02-262-26/+28
| | | |/ / | | |/| |
| * | | | Remove environments folder webpack entry pointClement Ho2018-02-261-1/+0
| |/ / /
| * | | Remove webpack bundle tags for blobJacob Schatz2018-02-261-3/+0
| * | | Merge branch '41255-refactoring-of-blob-link-methods-in-blob_helper' into 'ma...Douwe Maan2018-02-263-4/+4
| |\ \ \
| | * | | refactor methods inline41255-refactoring-of-blob-link-methods-in-blob_helperJames Lopez2018-02-231-1/+1
| | * | | inline methodsJames Lopez2018-02-231-2/+2
| | * | | refactor code based on feedbackJames Lopez2018-02-232-3/+3
| | * | | some initial refactoringJames Lopez2018-02-232-3/+3
| | | |/ | | |/|
| * | | Don't convert issuable_initial_data into JSONjprovazn-issuable-dataJan Provaznik2018-02-261-1/+1
| | |/ | |/|
| * | Merge branch 'backport-qa_78' into 'master'Grzegorz Bizon2018-02-252-2/+2
| |\ \
| | * | test merge request rebaseFelipe Artur2018-02-192-2/+2
| * | | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-2337-297/+484
| |\ \ \
| | * \ \ Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-231-1/+0
| | |\ \ \
| | | * | | Removed webpack tagConstance Okoghenun2018-02-231-1/+0
| | | | |/ | | | |/|
| | * | | Merge branch 'remove-issues-show' into 'master'Jacob Schatz2018-02-231-3/+0
| | |\ \ \
| | | * | | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-231-3/+0
| | | |/ /
| | * | | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-1/+1
| | * | | Merge branch '29497-pages-custom-domain-dns-verification' into 'master'Robert Speicher2018-02-2311-2/+149
| | |\ \ \
| | | * | | Add DNS verification to Pages custom domainsNick Thomas2018-02-2311-2/+149
| | | |/ /
| | * | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master'Filipa Lacerda2018-02-237-23/+50
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add a button to deploy a runner to a Kubernetes cluster in the settings page42044-osw-add-button-to-deploy-runner-to-kubernetesOswaldo Ferreira2018-02-237-23/+50
| | * | | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'Phil Hughes2018-02-231-7/+8
| | |\ \ \
| | | * | | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tabEric Eastwood2018-02-201-7/+8
| | * | | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-237-167/+214
| | |\ \ \ \
| | | * | | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-227-167/+214
| | * | | | | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-232-0/+18
| | * | | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-226-87/+43
| | |\ \ \ \ \
| | | * | | | | Unify use of can_current_user_push_code Presenter42431-add-auto-devops-and-clusters-button-to-projectsOswaldo Ferreira2018-02-222-2/+2
| | | * | | | | Move project presenter instance creation to controllerOswaldo Ferreira2018-02-222-2/+0
| | | * | | | | Merge branch 'master' into 42431-add-auto-devops-and-clusters-button-to-projectsEric Eastwood2018-02-2285-175/+116
| | | |\ \ \ \ \ | | | | |/ / / /
| | | * | | | | Remove indent and reduce bloat with link_to_ifEric Eastwood2018-02-221-10/+6
| | | * | | | | Link "add a Kubernetes cluster" to new cluster pageEric Eastwood2018-02-211-1/+1
| | | * | | | | Use OpenStruct instead Hash for statistics buttonsOswaldo Ferreira2018-02-201-4/+4
| | | * | | | | Improve methods namingOswaldo Ferreira2018-02-202-5/+5
| | | * | | | | Move default_project_view tests to presenterOswaldo Ferreira2018-02-201-1/+1
| | | * | | | | Move button list logic to project presenterOswaldo Ferreira2018-02-205-8/+11
| | | * | | | | Switch back to using a single partialEric Eastwood2018-02-202-8/+8
| | | * | | | | Add Auto DevOps and Kubernetes cluster button to project pageEric Eastwood2018-02-164-83/+42
| | * | | | | | Remove bundle tag for ui helpJacob Schatz2018-02-221-2/+0
| | * | | | | | Merge branch 'revert-3487441b' into 'master'Sean McGivern2018-02-221-4/+1
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441bVictor Wu2018-02-211-4/+1