summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Prefer local variables insteadqa-deploy-key-scenarioLin Jen-Shin2018-01-241-4/+4
* Add an test for QA::Runtime::RSAKeyLin Jen-Shin2018-01-241-0/+9
* Move initialize method later.Lin Jen-Shin2018-01-241-3/+3
* Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenarioLin Jen-Shin2018-01-24356-4642/+6164
|\
| * Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'Douwe Maan2018-01-242-1/+15
| |\
| | * Remove callback as we already update accordingly on servicesOswaldo Ferreira2018-01-242-24/+0
| | * Update changelogosw-updates-merge-status-on-api-actionsOswaldo Ferreira2018-01-231-1/+1
| | * Return more consistent values for merge_status on MR APIOswaldo Ferreira2018-01-234-1/+39
| * | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-246-0/+165
| |\ \
| | * | Make the exposing of the Application secret more explicitPNSalocin/gitlab-ce-24035-api-create-applicationToon Claes2018-01-242-3/+7
| | * | Add documentation about when the application API was addedToon Claes2018-01-242-1/+6
| | * | Add application create APINicolas MERELLI2018-01-246-0/+156
| * | | Merge branch 'groups-webpack-bundle' into 'master'Filipa Lacerda2018-01-2413-19/+24
| |\ \ \
| | * | | fixed paginationgroups-webpack-bundlePhil Hughes2018-01-231-3/+1
| | * | | fixed group page specific JSPhil Hughes2018-01-231-2/+0
| | * | | Added dispatcher imports for groups webpack bundlePhil Hughes2018-01-2311-16/+25
| * | | | Merge branch 'sh-fix-cross-site-forgery-errors' into 'master'Rémy Coutable2018-01-241-0/+2
| |\ \ \ \
| | * | | | Return a blank JSON response for a missing .js file to prevent Rails CSRF errorssh-fix-cross-site-forgery-errorsStan Hu2018-01-231-0/+2
| * | | | | Merge branch 'ph-even-more-dispatcher-imports' into 'master'Filipa Lacerda2018-01-245-21/+13
| |\ \ \ \ \
| | * | | | | added missing importsPhil Hughes2018-01-241-0/+4
| | * | | | | correctly imports performance barPhil Hughes2018-01-242-4/+2
| | * | | | | Added imports for dispatcher routesPhil Hughes2018-01-242-17/+7
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'winh-axios-mock-restore' into 'master'Filipa Lacerda2018-01-2410-15/+15
| |\ \ \ \ \
| | * | | | | Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-2310-15/+15
| * | | | | | Merge branch 'rc/improve-setup-test-env' into 'master'Grzegorz Bizon2018-01-243-5/+15
| |\ \ \ \ \ \
| | * | | | | | Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the co...rc/improve-setup-test-envRémy Coutable2018-01-233-5/+15
| * | | | | | | Merge branch 'fix/gitaly-can-be-merged-for-missing-conflict-files' into 'master'Grzegorz Bizon2018-01-242-1/+12
| |\ \ \ \ \ \ \
| | * | | | | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-232-1/+12
| * | | | | | | | Merge branch 'qa-deploy-key-factory-product' into 'master'Grzegorz Bizon2018-01-244-11/+15
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '32546-cannot-copy-paste-on-ios' into 'master'Phil Hughes2018-01-242-0/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | add CHANGELOG.md entry for !1580432546-cannot-copy-paste-on-iosMike Greiling2018-01-241-0/+5
| | * | | | | | | | disable CopyAsGFM on iOS due to bug in webkitMike Greiling2018-01-241-0/+7
| * | | | | | | | | Merge branch '42251-explicit-timezone-for-karma' into 'master'Mike Greiling2018-01-232-0/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Set timezone for karma to UTCTakuya Noguchi2018-01-232-0/+7
| * | | | | | | | | Merge branch '42340-ci-failing-on-mergerequestdiff-commits_count' into 'master'Stan Hu2018-01-231-0/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_countRémy Coutable2018-01-231-0/+4
| * | | | | | | | | | Merge branch 'fix-gitlab-runner-2652' into 'master'Kamil Trzciński2018-01-231-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix docs for GIT_CHECKOUT Gitlab Runner configurationTom Elliff2018-01-171-1/+1
| * | | | | | | | | | | Merge branch 'dm-push-rule-regexp-error-ce' into 'master'Douwe Maan2018-01-231-17/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Backport changes to Gitlab::Checks::ChangeAccess from EEDouwe Maan2018-01-231-17/+21
| * | | | | | | | | | | Merge branch 'dispatcher-milestones-show-path' into 'master'Jacob Schatz2018-01-234-4/+22
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Refactor dispatcher milestones show pathdispatcher-milestones-show-pathClement Ho2018-01-224-4/+22
| * | | | | | | | | | | | Merge branch 'psimyn-webpack-bundle-env-metrics' into 'master'Phil Hughes2018-01-234-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | remove webpack bundle tag for monitoring:environments:metricsSimon Knox2018-01-234-3/+10
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge branch 'dm-process-feature-deadlines' into 'master'Rémy Coutable2018-01-231-3/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessa...Douwe Maan2018-01-231-3/+27
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'fix/adjust-layout-width-for-fixed-layout' into 'master'Phil Hughes2018-01-2310-27/+31
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Adjust last push notification widthGeorge Tsiolis2018-01-2310-27/+31
| * | | | | | | | | | | | | Merge branch 'dispatcher-new' into 'master'Clement Ho2018-01-233-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | consistent function exports for Labels edit/new pagesdispatcher-newSimon Knox2018-01-233-3/+3
View Lorry Controller Status