summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'winh-inline-script-linter' into 'master'Rémy Coutable2018-03-0113-0/+15
|\
| * Ignore InlineJavaScript linter in existing script tag locations.winh-inline-script-linterConnor Shea2018-02-2813-0/+15
* | Merge branch 'protected-tags-bundle-refactor' into 'master'Clement Ho2018-03-011-3/+0
|\ \
| * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into protect...protected-tags-bundle-refactorConstance Okoghenun2018-02-2716-55/+41
| |\ \
| * \ \ Resolved conflicts in app/assets/javascripts/pages/projects/settings/reposito...Constance Okoghenun2018-02-269-12/+7
| |\ \ \
| * | | | Removed protected_tags webpack bundleConstance Okoghenun2018-02-231-3/+0
* | | | | Merge branch 'pipelines_show_refactor' into 'master'Jacob Schatz2018-02-281-1/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' into 'pipelines_show_refactor'pipelines_show_refactorClement Ho2018-02-2823-86/+95
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into 'pipelines_show_refactor'Clement Ho2018-02-2713-14/+0
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into 'pipelines_show_refactor'Clement Ho2018-02-2724-66/+48
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Refactor pipelines show for webpack bundle tag removalJacob Schatz2018-02-231-1/+0
* | | | | | | Remove webpack bundle tag for enviromentsConstance Okoghenun2018-02-281-1/+0
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'master' into 'dispatcher-cleanup'Jacob Schatz2018-02-289-32/+57
|\ \ \ \ \ \
| * | | | | | Remove cycle analytics bundle webpack entry pointClement Ho2018-02-281-1/+0
| * | | | | | 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-284-0/+11
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Add IP Address to project runner show page (#43489)Dylan Griffith2018-02-281-0/+3
| | * | | | | | Add IP Address to admin runners table (#43489)Dylan Griffith2018-02-282-0/+3
| | * | | | | | Add ip_address to admin runner form (#43489)Dylan Griffith2018-02-281-0/+5
* | | | | | | | remove a bunch of superfluous common_vue bundlesdispatcher-cleanupMike Greiling2018-02-287-17/+0
|/ / / / / / /
* | | | | | | 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-284-32/+38
|/ / / / / /
* | | | | | Remove snippet bundle webpack entry pointClement Ho2018-02-271-1/+0
| |_|/ / / |/| | | |
* | | | | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactorConstance Okoghenun2018-02-2716-55/+41
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'remove-sidebar-bundle' into 'master'Jacob Schatz2018-02-271-1/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into remove-sidebar-bundleremove-sidebar-bundleClement Ho2018-02-231-1/+0
| | |\ \ \ \
| | * | | | | Remove sidebar bundle webpack entry pointClement Ho2018-02-231-1/+0
| | | |/ / / | | |/| | |
| * | | | | Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ceRémy Coutable2018-02-271-3/+5
| * | | | | Move the #update action from Project/Member controllers to the MembershipActi...Rémy Coutable2018-02-273-8/+4
| * | | | | 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 'ph-webpack-bundle-tags' into 'master'Filipa Lacerda2018-02-273-8/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-276-32/+29
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-263-8/+0
| * | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into profile...Constance Okoghenun2018-02-2628-41/+207
|\ \ \ \ \ \ \ \ | |/ / / / / / /