summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Resolved conflicts with masterdispatcher-project-mr-showConstance Okoghenun2018-01-23101-3571/+4443
|\
| * 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
| * | | | | | Merge branch 'tz-upgrade-jasmine-and-raven' into 'master'Clement Ho2018-01-237-55/+32
| |\ \ \ \ \ \
| | * | | | | | Upgrade jasmine + raven to newer versionsTim Zallmann2018-01-237-55/+32
| |/ / / / / /
| * | | | | | Merge branch 'vendor-10-4-auto-devops-template' into 'master'Marin Jankovski2018-01-231-10/+0
| |\ \ \ \ \ \
| | * | | | | | Vendor 10.4 Auto DevOps templatevendor-10-4-auto-devops-templatebikebilly2018-01-231-10/+0
| * | | | | | | Merge branch 'prevent-high-sierra-fork-crash' into 'master'Grzegorz Bizon2018-01-231-0/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent Unicorn crashing in development on macOSJacob Vosmaer (GitLab)2018-01-231-0/+13
| |/ / / / / / /
| * | | | | | | Merge branch 'sh-s3-digitalocean-howto-docs' into 'master'Achilleas Pipinellis2018-01-231-0/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Document how to configure Fog with Digital Ocean Spacessh-s3-digitalocean-howto-docsStan Hu2018-01-191-0/+24
| * | | | | | | | Merge branch 'docs/update-rack-attack' into 'master'Achilleas Pipinellis2018-01-231-13/+123
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update rack attack docsCindy Pallares 🦉2018-01-231-13/+123
| |/ / / / / / / /
| * | | | | | | | Merge branch '42022-allow-users-to-request-access-not-visible-when-project-vi...Fatih Acet2018-01-232-1/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | add CHANGELOG.md entry for !1648542022-allow-users-to-request-access-not-visible-when-project-visibility-is-publicMike Greiling2018-01-191-0/+5
| | * | | | | | | | display "allow users to request access option" in public projectsMike Greiling2018-01-191-1/+1
| * | | | | | | | | Merge branch 'winh-axios-mock-adapter-docs' into 'master'Filipa Lacerda2018-01-231-3/+16
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Document advantages of axios-mock-adapterWinnie Hellmann2018-01-231-3/+16
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '131-qa-api-driver' into 'master'Grzegorz Bizon2018-01-2318-24/+420
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add ability to drive the API in QA specsBrett Walker2018-01-2318-24/+420
| |/ / / / / / / / /
| * | | | | | | | | Merge branch 'tz-upgrade-vue-again' into 'master'Filipa Lacerda2018-01-2317-64/+78
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Upgraded all vue librariesTim Zallmann2018-01-2317-64/+78
| * | | | | | | | | | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-233-5/+60
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-224-6/+61
| | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-2310-41/+165
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-227-37/+152
| | * | | | | | | | | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-193-4/+13
| * | | | | | | | | | Merge branch 'add-js-note-live-debug' into 'master'Rémy Coutable2018-01-231-0/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add note about live_debug only working on javascript enabled specsadd-js-note-live-debugClement Ho2018-01-221-0/+2
| * | | | | | | | | | | Merge branch 'fl-update-svg' into 'master'Tim Zallmann2018-01-238-9/+12
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Backport for Resolve "change status icon for reports when fails to be found o...Filipa Lacerda2018-01-238-9/+12
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'docs/rs-archive-more-changelogs' into 'master'Rémy Coutable2018-01-232-3249/+3249
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Archive changelogs for versions before 8.16docs/rs-archive-more-changelogsRobert Speicher2018-01-222-3249/+3249
| * | | | | | | | | | | Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-233-8/+27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-222-3/+3
| | * | | | | | | | | | | Improve pending case testFilipa Lacerda2018-01-221-2/+2
| | * | | | | | | | | | | Adds information for pending stateFilipa Lacerda2018-01-222-6/+12
| | * | | | | | | | | | | Update testsFilipa Lacerda2018-01-191-2/+1