summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/edit_pages_domain' into 'master'Nick Thomas2018-02-284-31/+46
|\
| * PagesDomain: improve breadcrumbsRob Watson2018-02-283-0/+6
| * PagesDomain: Add edit/update functionalityRob Watson2018-02-284-31/+40
* | Merge branch '43489-display-runner-ip' into 'master'Kamil Trzciński2018-02-282-0/+8
|\ \ | |/ |/|
| * Add IP Address to project runner show page (#43489)Dylan Griffith2018-02-281-0/+3
| * Add ip_address to admin runner form (#43489)Dylan Griffith2018-02-281-0/+5
* | Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-282-4/+0
|\ \
| * | remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-272-4/+0
| |/
* | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-283-29/+34
|/
* Move the #update action from Project/Member controllers to the MembershipActi...Rémy Coutable2018-02-271-4/+0
* Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-271-1/+0
|\
| * Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-273-3/+1
| |\
| * \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-262-26/+28
| |\ \
| * | | Remove diff notes webpack entry pointClement Ho2018-02-261-1/+0
* | | | Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-276-32/+29
|\ \ \ \ | | |_|/ | |/| |
| * | | 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
* | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-263-8/+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 '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-232-2/+36
|\ \ \
| * | | Add DNS verification to Pages custom domainsNick Thomas2018-02-232-2/+36
| |/ /
* | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master'Filipa Lacerda2018-02-233-6/+5
|\ \ \ | |/ / |/| |
| * | 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-233-6/+5
* | | 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
* | | | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-232-0/+18
* | | | 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-2248-102/+50
|\ \ \ \
| * | | | Rest of Dispatcher RefactorJacob Schatz2018-02-215-8/+1
| | |/ / | |/| |
| * | | Merge branch 'ce-3776-ci-view-for-sast' into 'master'Phil Hughes2018-02-211-6/+6
| |\ \ \