summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix broken testfl-vue-mr-widgetFilipa Lacerda2018-01-291-2/+2
* [ci skip] Merge branch 'master' into fl-vue-mr-widgetFilipa Lacerda2018-01-2939-395/+500
|\
| * Merge branch 'ph-more-axios' into 'master'Filipa Lacerda2018-01-297-189/+150
| |\
| | * normalize headers correctlyPhil Hughes2018-01-293-13/+5
| | * fixed dashboard projects not being filterablePhil Hughes2018-01-291-1/+1
| | * Converted filterable_list to axiosPhil Hughes2018-01-292-25/+20
| | * Converted due_date_select to axiosPhil Hughes2018-01-291-27/+21
| | * Converted dropzone_input to axiosPhil Hughes2018-01-291-18/+15
| | * Converted create_merge_request_dropdown to axiosPhil Hughes2018-01-291-80/+67
| | * converted compare_autocomplete to axiosPhil Hughes2018-01-291-7/+8
| | * Convered compare.js to axiosPhil Hughes2018-01-291-26/+21
| |/
| * Merge branch 'gitlab-git-spawn-env' into 'master'Rémy Coutable2018-01-293-23/+35
| |\
| | * Set alternate object directories in run_gitJacob Vosmaer (GitLab)2018-01-293-23/+35
| |/
| * Merge branch '42290-pass-BUNDLE_PATH' into 'master'Rémy Coutable2018-01-292-2/+10
| |\
| | * Pass BUNDLE_PATH to install to the same path for test42290-pass-BUNDLE_PATHLin Jen-Shin2018-01-262-2/+10
| * | Merge branch 'sh-digital-ocean-s3-docs' into 'master'Achilleas Pipinellis2018-01-291-8/+10
| |\ \
| | * | Digital Ocean Spaces now supports AWS v4 streaming APIStan Hu2018-01-281-8/+10
| |/ /
| * | Merge branch 'generalize-js-toggle-buttons' into 'master'Filipa Lacerda2018-01-2612-155/+225
| |\ \
| | * | Generalize toggle_buttons.jsgeneralize-js-toggle-buttonsEric Eastwood2018-01-2612-155/+225
| * | | Merge branch 'fix/issues-spec' into 'master'Stan Hu2018-01-261-2/+2
| |\ \ \
| | * | | Fix spec failures in issues_spec.rbAhmad Sherif2018-01-261-2/+2
| * | | | Merge branch 'cs-fix-commercial-content-check' into 'master'Robert Speicher2018-01-262-8/+15
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix #42486.Connor Shea2018-01-262-8/+15
| |/ / /
| * | | Merge branch '42327-import-from-gitlab-com-fails-destination-already-exists-a...Douwe Maan2018-01-2611-8/+53
| |\ \ \ | | |_|/ | |/| |
| | * | update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-267-7/+16
| | * | add changelogJames Lopez2018-01-261-0/+6
| | * | fix specJames Lopez2018-01-261-1/+1
| | * | add specJames Lopez2018-01-263-1/+14
| | * | disable retry attempts for Import/Export until that is fixedJames Lopez2018-01-263-2/+13
| | * | add an extra specJames Lopez2018-01-261-1/+5
| | * | fix validation error on servicesJames Lopez2018-01-265-4/+6
| |/ /
* | | Move mr_widget_merged into a vue fileFilipa Lacerda2018-01-264-251/+290
|/ /
* | Merge branch 'fl-mr-widget-components' into 'master'Phil Hughes2018-01-267-355/+357
|\ \
| * | Adds missing i18nFilipa Lacerda2018-01-261-2/+2
| * | Merge branch 'master' into fl-mr-widget-componentsFilipa Lacerda2018-01-2556-272/+451
| |\ \
| * | | Moves components into vue files:fl-mr-widget-componentsFilipa Lacerda2018-01-257-355/+357
* | | | Merge branch '42420-follow-up-from-resolve-asset-was-not-declared-to-be-preco...Grzegorz Bizon2018-01-266-13/+29
|\ \ \ \
| * | | | Port some non-EE-specific config/ changes to CE42420-follow-up-from-resolve-asset-was-not-declared-to-be-precompiled-in-production-favicon-green-icoRémy Coutable2018-01-256-13/+29
* | | | | Merge branch 'qa/ee-4698-backport' into 'master'Grzegorz Bizon2018-01-268-15/+92
|\ \ \ \ \
| * | | | | Pick EE for qa/qa/page/menu/side.rbqa/ee-4698-backportLin Jen-Shin2018-01-261-0/+1
| * | | | | Pick the EE version for this fileLin Jen-Shin2018-01-261-5/+5
| * | | | | Merge remote-tracking branch 'upstream/master' into qa/ee-4698-backportLin Jen-Shin2018-01-269-4/+139
| |\ \ \ \ \
| * | | | | | Backport QA changes from EEGabriel Mazetto2018-01-268-11/+87
* | | | | | | Merge branch 'filipefreire_155' into 'master'Rémy Coutable2018-01-264-0/+43
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-251-2/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-25969-9131/+15572
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | improve push events selector in activity.rbFilipe Freire2018-01-181-5/+1
| * | | | | | | | improve interaction with activity on side.rbFilipe Freire2018-01-181-1/+3
| * | | | | | | | improvements after CRFilipe Freire2018-01-165-28/+14
| * | | | | | | | Merge branch 'filipefreire_155' of https://gitlab.com/filipefreire/gitlab-ce ...Filipe Freire2018-01-160-0/+0
| |\ \ \ \ \ \ \ \
View Lorry Controller Status