summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'osw-backport-dev-env-check-for-storage-settings-deprecation' ↵Rémy Coutable2018-04-252-2/+2
|\ | | | | | | | | | | | | into 'master' Backport dev env check for storage settings deprecation See merge request gitlab-org/gitlab-ce!18461
| * Backport dev env check for storage settings deprecationOswaldo Ferreira2018-04-242-2/+2
| |
* | Merge branch 'fix-settings-preloading' into 'master'Rémy Coutable2018-04-255-3/+4
|\ \ | | | | | | | | | | | | Do not preload settings See merge request gitlab-org/gitlab-ce!18566
| * | Do not preload settingsKamil Trzciński2018-04-245-3/+4
| | |
* | | Merge branch 'winh-mock-pager' into 'master'Clement Ho2018-04-243-51/+71
|\ \ \ | |_|/ |/| | | | | | | | Mock Pager in Karma tests See merge request gitlab-org/gitlab-ce!18556
| * | Mock Pager in Karma testsWinnie Hellmann2018-04-243-51/+71
|/ /
* | Merge branch '45725-broken-master' into 'master'Clement Ho2018-04-241-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Broken master with `static_analysis` and `karma` being broken" Closes #45725 See merge request gitlab-org/gitlab-ce!18569
| * | Update import on actions file to fix conflict when rewire plugin was addedFilipa Lacerda2018-04-241-2/+2
|/ /
* | Merge branch 'patch-29' into 'master'Rémy Coutable2018-04-241-1/+1
|\ \ | | | | | | | | | | | | Broken link fix See merge request gitlab-org/gitlab-ce!18564
| * | Broken link fixAna Karabanova 🐱2018-04-241-1/+1
| | |
* | | Merge branch 'matbaj/gitlab-ce-add-inherit-command' into 'master'Rémy Coutable2018-04-244-3/+105
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add copy_metadata quick action Closes #38450 See merge request gitlab-org/gitlab-ce!18497
| * \ \ Merge branch 'master' into matbaj/gitlab-ce-add-inherit-commandSean McGivern2018-04-24465-2480/+2764
| |\ \ \
| * | | | Make /copy_metadata only handle the first issuable passedSean McGivern2018-04-243-13/+24
| | | | |
| * | | | Merge branch 'master' into matbaj/gitlab-ce-add-inherit-commandSean McGivern2018-04-193483-48546/+139782
| |\ \ \ \
| * \ \ \ \ Rebase branch 'add-inherit-command'Mateusz Bajorski2018-03-030-0/+0
| |\ \ \ \ \
| | * | | | | Fixed inconsistent descriptions and refactored reference checkingMateusz Bajorski2018-02-012-3/+3
| | | | | | |
| | * | | | | Fixed typos and improved reference checkingMateusz Bajorski2018-01-314-23/+23
| | | | | | |
| | * | | | | Changed command name to copy_metadata and added MR supportMateusz Bajorski2018-01-214-32/+34
| | | | | | |
| | * | | | | Add Inherit quick actionMateusz Bajorski2018-01-154-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38450
| * | | | | | Fixed inconsistent descriptions and refactored reference checkingMateusz Bajorski2018-03-032-3/+3
| | | | | | |
| * | | | | | Fixed typos and improved reference checkingMateusz Bajorski2018-03-034-23/+23
| | | | | | |
| * | | | | | Changed command name to copy_metadata and added MR supportMateusz Bajorski2018-03-034-32/+34
| | | | | | |
| * | | | | | Add Inherit quick actionMateusz Bajorski2018-03-034-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #38450
* | | | | | | Merge branch 'bvl-fix-maintainer-push-error' into 'master'Douwe Maan2018-04-2416-72/+176
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix errors on pushing/editing files on empty repositories Closes #44618 and #42583 See merge request gitlab-org/gitlab-ce!18462
| * | | | | | Allow admins to push to empty reposBob Van Landuyt2018-04-2412-61/+102
| | | | | | |
| * | | | | | Only show push-to-master authorized usersBob Van Landuyt2018-04-244-11/+74
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hide the push to master instructions for users that are not allowed to do that. Also hide buttons that would direct them to commit directly in master
* | | | | | Merge branch 'jr-40616-external-lfs-docs' into 'master'Douwe Maan2018-04-241-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for externally hosted LFS objects See merge request gitlab-org/gitlab-ce!18508
| * | | | | | Document externally hosted LFS objectsJames Ramsay2018-04-241-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API can be used by project owners to disable LFS object verification that will block pushes that contain LFS pointers but no the objects.
* | | | | | | Merge branch '30998-add-babel-rewire-plugin' into 'master'Clement Ho2018-04-2452-142/+197
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Add some way to mock and spy on default ES modules" Closes #30998 See merge request gitlab-org/gitlab-ce!18116
| * | | | | | fix CI BABEL_ENV variableMike Greiling2018-04-231-1/+1
| | | | | | |
| * | | | | | document the spyOnDependency methodMike Greiling2018-04-231-5/+43
| | | | | | |
| * | | | | | disable sourcemaps when generating coverage report to avoid out-of-memory errorsMike Greiling2018-04-231-1/+1
| | | | | | |
| * | | | | | only apply rewire plugin when running karma testsMike Greiling2018-04-232-3/+3
| | | | | | |
| * | | | | | fix illegal references to "this" in module contextMike Greiling2018-04-2315-19/+19
| | | | | | |
| * | | | | | add default exports to prevent rewire plugin from breaking vuexMike Greiling2018-04-238-0/+24
| | | | | | |
| * | | | | | convert remaining instances of import * to use spyOnDependencyMike Greiling2018-04-238-48/+35
| | | | | | |
| * | | | | | fix more instances of "import *" with spyOnDependencyMike Greiling2018-04-2311-45/+32
| | | | | | |
| * | | | | | fix tests in filtered_search_manager_spec.jsMike Greiling2018-04-231-8/+7
| | | | | | |
| * | | | | | fix tests in droplab/hook_spec.jsMike Greiling2018-04-231-3/+2
| | | | | | |
| * | | | | | fix tests in comment_type_toggle_spec.jsMike Greiling2018-04-231-3/+2
| | | | | | |
| * | | | | | add spyOnDependency methodMike Greiling2018-04-234-7/+18
| | | | | | |
| * | | | | | update babel configMike Greiling2018-04-231-0/+3
| | | | | | |
| * | | | | | add babel-plugin-rewire to karma buildMike Greiling2018-04-233-1/+9
| | | | | | |
* | | | | | | Merge branch '4950-unassign-slash-command-preview-fix' into 'master'Sean McGivern2018-04-242-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unassign slash command preview See merge request gitlab-org/gitlab-ce!18447
| * | | | | | | Fix unassign slash command previewAthar Hameed2018-04-242-2/+9
|/ / / / / / /
* | | | | | | Merge branch ↵Grzegorz Bizon2018-04-243-19/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43111-controller-projects-mergerequestscontroller-index-executes-more-than-100-sql-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#index executes more than 100 SQL queries" Closes #43111 See merge request gitlab-org/gitlab-ce!18561
| * | | | | | | Fix an N+1 for MRs from forks on the MR index pageSean McGivern2018-04-243-19/+40
| | | | | | | |
* | | | | | | | Merge branch 'show-runners-description-on-jobs-page' into 'master'Kamil Trzciński2018-04-243-2/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show Runner's description on job's page See merge request gitlab-org/gitlab-ce!17321
| * | | | | | | | Add CHANGELOG entryTomasz Maczukin2018-04-241-0/+5
| | | | | | | | |
| * | | | | | | | Show Runner's description on job's pageTomasz Maczukin2018-04-242-2/+2
|/ / / / / / / /
View Lorry Controller Status