summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix for open-ended parameter's in lograge causing elastic memory issuesAndrew Newdigate2018-02-281-1/+6
* Merge branch 'feature/edit_pages_domain' into 'master'Nick Thomas2018-02-281-1/+1
|\
| * PagesDomain: Add edit/update functionalityRob Watson2018-02-281-1/+1
* | Specify base controller for Doorkeeperbvl-fix-qa-doorkeeperBob Van Landuyt2018-02-281-0/+2
|/
* Merge branch 'remove-merge-conflicts-bundle' into 'master'Jacob Schatz2018-02-281-4/+0
|\
| * remove duplicate common and common_vue definitionsremove-merge-conflicts-bundleMike Greiling2018-02-271-2/+0
| * remove merge_conflicts bundle in favor of pages directory entry pointMike Greiling2018-02-271-2/+0
* | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-282-0/+3
|/
* Merge branch '43669-fix-webpack-trailing-comma' into 'master'Mike Greiling2018-02-271-1/+1
|\
| * Remove trailing comma in webpack config to support Node@<8Eric Eastwood2018-02-271-1/+1
* | Remove snippet bundle webpack entry pointClement Ho2018-02-271-1/+0
* | Resolved conflicts in dispatcher.jsprofile-bundle-tag-refactorConstance Okoghenun2018-02-271-38/+50
|\ \ | |/
| * 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/+2
| | |\
| | * | Remove sidebar bundle webpack entry pointClement Ho2018-02-231-1/+0
| * | | Prevent webpack from rebooting while switching branchesMike Greiling2018-02-271-25/+52
| * | | Merge branch 'refactor-commit-show' into 'master'Phil Hughes2018-02-271-2/+0
| |\ \ \
| | * \ \ Merge branch 'master' into 'refactor-commit-show'refactor-commit-showPhil Hughes2018-02-271-4/+0
| | |\ \ \
| | * \ \ \ Merge branch 'master' into refactor-commit-showClement Ho2018-02-261-8/+3
| | |\ \ \ \
| | * | | | | Remove diff notes webpack entry pointClement Ho2018-02-261-2/+0
| * | | | | | Merge branch 'master' into 'ph-webpack-bundle-tags'ph-webpack-bundle-tagsPhil Hughes2018-02-271-13/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'refactor-pipelines-list' into 'master'Phil Hughes2018-02-271-2/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into refactor-pipelines-listrefactor-pipelines-listClement Ho2018-02-261-8/+3
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Remove commit_pipelines webpack entry pointClement Ho2018-02-261-2/+0
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'master' into refactor-environments-folderrefactor-environments-folderClement Ho2018-02-261-8/+3
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Refactor wildcard dispatcher importsClement Ho2018-02-261-8/+2
| | | * | | | Move EE-specific JavaScript files to ee/app/assets/javascriptsRémy Coutable2018-02-261-0/+1
| | | |/ / /
| | * | | | Remove environments folder webpack entry pointClement Ho2018-02-261-2/+0
| | |/ / /
| * | | | Converted webpack_bundle_tag to be automatic webpack bundlesPhil Hughes2018-02-261-3/+0
* | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into profile...Constance Okoghenun2018-02-266-14/+28
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove webpack bundle tags for blobJacob Schatz2018-02-261-1/+0
| |/ / /
| * | | Restart Unicorn and Sidekiq when GRPC throws 14:Endpoint read failedJacob Vosmaer (GitLab)2018-02-261-1/+1
| | |/ | |/|
| * | Merge branch 'master' into 'boards-bundle-refactor'Jacob Schatz2018-02-236-17/+60
| |\ \ | | |/
| | * Merge branch 'project-deploy-keys-bundle-tag-refactor' into 'master'Jacob Schatz2018-02-231-1/+0
| | |\
| | | * Refactored webpack bundle tag for deploy keysproject-deploy-keys-bundle-tag-refactorConstance Okoghenun2018-02-231-1/+0
| | * | Merge branch 'reduce-webpack-merge-conflicts' into 'master'Jacob Schatz2018-02-231-8/+10
| | |\ \
| | | * | move webpack bundles we intend to keep below the list of bundles we're refact...reduce-webpack-merge-conflictsMike Greiling2018-02-231-8/+10
| | * | | Merge branch 'remove-issues-show' into 'master'Jacob Schatz2018-02-231-2/+0
| | |\ \ \ | | | |/ /
| | | * | remove issue_show webpack bundle in favor of pages/projects/issues/show/index.jsremove-issues-showMike Greiling2018-02-231-2/+0
| | | |/
| | * | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-1/+3
| | * | Add DNS verification to Pages custom domainsNick Thomas2018-02-234-1/+14
| | |/
| * | Resolved conflicts with masterConstance Okoghenun2018-02-213-25/+22
| |\ \
| * \ \ Resolved conflicts with masterConstance Okoghenun2018-02-203-7/+4
| |\ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into boards-...Constance Okoghenun2018-02-163-8/+8
| |\ \ \ \
| * | | | | Refactored use of boards/boards_bundle.js, created a dipatcher importConstance Okoghenun2018-02-151-1/+0
* | | | | | removed profile webpack bundle tagConstance Okoghenun2018-02-231-1/+0
| |_|_|_|/ |/| | | |
* | | | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-221-0/+25
* | | | | Backport of Webpack auto include for EE importsClement Ho2018-02-221-6/+8
| |_|_|/ |/| | |
* | | | Rest of Dispatcher RefactorJacob Schatz2018-02-212-3/+1
* | | | #28481: Display time tracking totals on milestone pageRiccardo Padovani2018-02-211-1/+1