summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add back database changes for Ci::Buildrevert-215dff76Stan Hu2018-02-163-2/+27
* Revert "Merge branch 'expired-ci-artifacts' into 'master'"Stan Hu2018-02-165-65/+6
* Merge branch 'fix-more-dispatcher-stuff' into 'master'Jacob Schatz2018-02-1631-206/+54
|\
| * migrate admin:users:* to static bundlefix-more-dispatcher-stuffMike Greiling2018-02-164-24/+4
| * correct for missing break statement in dispatcher.jsMike Greiling2018-02-162-0/+1
| * alias create and update actions to new and editMike Greiling2018-02-161-4/+11
| * migrate projects:merge_requests:edit to static bundleMike Greiling2018-02-162-6/+1
| * migrate projects:merge_requests:creations:diffs to static bundleMike Greiling2018-02-162-6/+1
| * migrate projects:merge_requests:creations:new to static bundleMike Greiling2018-02-162-6/+2
| * migrate projects:issues:new and projects:issues:edit to static bundleMike Greiling2018-02-163-16/+2
| * migrate projects:branches:index to static bundleMike Greiling2018-02-162-7/+2
| * migrate projects:branches:new to static bundleMike Greiling2018-02-162-11/+3
| * migrate projects:compare:show to static bundleMike Greiling2018-02-162-7/+2
| * migrate projects:environments:metrics to static bundleMike Greiling2018-02-162-6/+1
| * migrate projects:milestones:* and groups:milestones:* to static bundleMike Greiling2018-02-165-28/+4
| * migrate explore:groups:index to static bundleMike Greiling2018-02-162-7/+2
| * migrate explore:projects:* to static bundleMike Greiling2018-02-162-8/+1
| * migrate dashboard:projects:* to static bundleMike Greiling2018-02-162-27/+21
| * migrate admin:jobs:index to static bundleMike Greiling2018-02-161-4/+2
| * migrate dashboard:todos:index to static bundleMike Greiling2018-02-162-6/+1
| * migrate groups:merge_requests to static bundleMike Greiling2018-02-162-7/+2
| * migrate groups:issues to static bundleMike Greiling2018-02-162-7/+2
| * migrate dashboard:merge_requests to static bundleMike Greiling2018-02-162-7/+2
| * migrate dashboard:issues to static bundleMike Greiling2018-02-162-7/+2
| * migrate dashboard:milestones:show to static bundleMike Greiling2018-02-162-7/+2
| * migrate groups:milestones:show to static bundleMike Greiling2018-02-162-6/+1
| * migrate projects:milestones:show to static bundleMike Greiling2018-02-162-7/+2
| * migrate projects:milestones:index to static bundleMike Greiling2018-02-162-6/+1
* | Merge branch '42641-monaco-service-workers-do-not-work-with-cdn-enabled' into...Tim Zallmann2018-02-162-0/+10
|\ \
| * | add CHANGELOG.md entry for !1702142641-monaco-service-workers-do-not-work-with-cdn-enabledMike Greiling2018-02-151-0/+5
| * | fix monaco editor config to ensure service workers are not loaded from cross-...Mike Greiling2018-02-151-0/+5
| |/
* | Merge branch 'fl-refresh-btn' into 'master'Tim Zallmann2018-02-162-1/+9
|\ \
| * | Show loading button inline in MR widgetfl-refresh-btnFilipa Lacerda2018-02-162-1/+9
* | | Merge branch '42050-combine-all-rake-based-lints-in-one-rake-process-in-ci' i...Robert Speicher2018-02-162-8/+52
|\ \ \
| * | | Run lint:all tasks in forks42050-combine-all-rake-based-lints-in-one-rake-process-in-ciRémy Coutable2018-02-142-13/+34
| * | | Combine all rake tasks in the static-analysis jobRémy Coutable2018-02-142-6/+29
* | | | Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'mas...Sean McGivern2018-02-162-4/+8
|\ \ \ \
| * | | | Fix project import API after import service refactorJames Lopez2018-02-162-4/+8
* | | | | Update CHANGELOG.md for 10.4.4Ian Baum2018-02-1611-51/+19
|/ / / /
* | | | Merge branch '43322-update-gcp-install-instructions-to-utilize-a-standard-vm-...Achilleas Pipinellis2018-02-1619-62/+24
|\ \ \ \
| * | | | Update GCP install instructions to utilize a standard VMJoshua Lambert2018-02-1619-62/+24
|/ / / /
* | | | Merge branch 'update-vendored-auto-devops-template-for-latest-sast-changes' i...Dmitriy Zaporozhets2018-02-161-1/+9
|\ \ \ \
| * | | | Update vendored AutoDevOps YML for latest SAST changesOlivier Gonzalez2018-02-161-1/+9
* | | | | Merge branch 'prometheus-bundle-tag-refactor' into 'master'Phil Hughes2018-02-164-10/+7
|\ \ \ \ \
| * | | | | Removed prometheus_metrics webpack bundle tagprometheus-bundle-tag-refactorConstance Okoghenun2018-02-164-10/+7
| | |_|/ / | |/| | |
* | | | | Merge branch '41899-api-endpoint-for-importing-a-project-export' into 'master'Sean McGivern2018-02-169-0/+260
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | update docsJames Lopez2018-02-164-5/+6
| * | | | refactor code based on feedback41899-api-endpoint-for-importing-a-project-exportJames Lopez2018-02-141-1/+1
| * | | | refactor code based on feedbackJames Lopez2018-02-142-3/+3
| * | | | refactor code based on feedbackJames Lopez2018-02-142-15/+30