summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-cache-clear-windowsfix-cache-clear-windowsMatija Čupić2018-01-2715-165/+242
|\
| * 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
| |/ /
* | | Add CHANGELOG entryMatija Čupić2018-01-261-0/+5
* | | Replace : with _ in cache key versioningMatija Čupić2018-01-262-2/+2
|/ /
* | 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
|/ /
* | 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
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-16256-2086/+4021
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/filipefreire/gitlab-ce into filip...Filipe Freire2018-01-16256-2086/+4021
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| * | | | | | | | | improvement after CRFilipe Freire2018-01-124-8/+29
| * | | | | | | | | improvements after CRFilipe Freire2018-01-122-9/+8
| * | | | | | | | | Add relevant element for push event buttonFilipe Freire2018-01-121-7/+4
| * | | | | | | | | gitlab-qa !155 push creates event on activity pageFilipe Freire2018-01-122-0/+42
* | | | | | | | | | Merge branch 'winh-check-axios-restore' into 'master'Filipa Lacerda2018-01-262-0/+18
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Make sure that axios adapater is restored after mockingwinh-check-axios-restoreWinnie Hellmann2018-01-252-0/+18
* | | | | | | | | | Merge branch 'qa-secret-variables-scenario' into 'master'Grzegorz Bizon2018-01-267-1/+131
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Just don't expand if it's already expandedLin Jen-Shin2018-01-261-4/+2
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into qa-secret-variables-scenarioLin Jen-Shin2018-01-2646-355/+542
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'fix-local-rspec-tests' into 'master'Mike Greiling2018-01-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | fix bug in webpack_helper in which force_same_domain argument was ignored bre...fix-local-rspec-testsMike Greiling2018-01-251-1/+1
* | | | | | | | | | Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master'Robert Speicher2018-01-251-2/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Fix rubocop offenses introduced in !16623Ahmad Sherif2018-01-251-2/+7