summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix bad merge conflictsccr/wip_filterClement Ho2018-10-013-12/+12
* Fix bad mergeClement Ho2018-09-261-0/+1
* Merge branch 'master' into 'ccr/wip_filter'Clement Ho2018-09-253746-29047/+140415
|\
| * Merge branch 'docs/zj-update-repository-lang' into 'master'Achilleas Pipinellis2018-09-251-1/+3
| |\
| | * Update doc/user/project/repository/index.mddocs/zj-update-repository-langZeger-Jan van de Weg2018-09-251-1/+3
| * | Merge branch '51316-qa-fix-transient-fork-spec-failure' into 'master'Rémy Coutable2018-09-253-4/+44
| |\ \
| | * | Assert successful sign in after registration51316-qa-fix-transient-fork-spec-failureMark Lapierre2018-09-253-4/+44
| * | | Merge branch 'frozen-string-app-controller-more' into 'master'Stan Hu2018-09-2552-1/+108
| |\ \ \
| | * | | Enable more frozen string in app/controllers/gfyoung2018-09-2352-1/+108
| * | | | Merge branch 'follow-up-geo-sync-disabled-wikis' into 'master'Douglas Barbosa Alexandre2018-09-2511-99/+11
| |\ \ \ \
| | * | | | Geo: sync disabled wikis. Stage 2follow-up-geo-sync-disabled-wikisValery Sizov2018-09-2511-99/+11
| * | | | | Merge branch 'fix-committer-typo' into 'master'Rémy Coutable2018-09-255-7/+12
| |\ \ \ \ \
| | * | | | | Fix committer typoGeorge Tsiolis2018-09-255-7/+12
| * | | | | | Merge branch 'leipert-fix-mr-widget-header-margins' into 'master'Annabel Dunstone Gray2018-09-252-25/+40
| |\ \ \ \ \ \
| | * | | | | | Fix merge request header marginsleipert-fix-mr-widget-header-marginsLukas Eipert2018-09-252-25/+40
| * | | | | | | Merge branch 'ce-improve-review-apps' into 'master'Douglas Barbosa Alexandre2018-09-256-0/+459
| |\ \ \ \ \ \ \
| | * | | | | | | [CE] Port review apps file to CEce-improve-review-appsRémy Coutable2018-09-256-0/+459
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'fa-handle_invalid_utf8_errors' into 'master'Stan Hu2018-09-255-0/+73
| |\ \ \ \ \ \ \
| | * | | | | | | Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errorsFelipe Artur2018-09-225-0/+73
| * | | | | | | | Merge branch 'osw-clean-up-phase-for-diff-files-removal' into 'master'Yorick Peterse2018-09-252-0/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Add clean-up phase for ScheduleDiffFilesDeletionOswaldo Ferreira2018-09-252-0/+28
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'ml-qa-register-ldap' into 'master'Dan Davison2018-09-255-8/+62
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Allow registration when LDAP is enabledml-qa-register-ldapMark Lapierre2018-09-245-8/+62
| * | | | | | | | | Merge branch 'enable-force-write-auth-keys-restore' into 'master'Nick Thomas2018-09-253-3/+50
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable write to auth_keys file during restoreCindy Pallares2018-09-253-3/+50
| * | | | | | | | | | Merge branch 'ide-remove-stage-buttons' into 'master'Filipa Lacerda2018-09-256-69/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fixed alignment of changed icon in commit headide-remove-stage-buttonsPhil Hughes2018-09-251-0/+1
| | * | | | | | | | | | Updated specs to account for removed buttonsPhil Hughes2018-09-214-65/+2
| | * | | | | | | | | | Remove stage/unstage buttons from IDE commit list itemsPhil Hughes2018-09-201-4/+0
| * | | | | | | | | | | Merge branch 'winh-destroy-mr-widget-polling' into 'master'Phil Hughes2018-09-252-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Cleanup polling of merge request widget in testsWinnie Hellmann2018-09-252-0/+6
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'ce-7013-add-epics-close-support' into 'master'Douglas Barbosa Alexandre2018-09-258-7/+58
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bacport FE changes from Closing Epicsce-7013-add-epics-close-supportJarka Košanová2018-09-246-1/+31
| | * | | | | | | | | | Add name definition for table methodJarka Košanová2018-09-241-0/+4
| | * | | | | | | | | | Add specs for closing and reopening issueJarka Košanová2018-09-241-6/+23
| * | | | | | | | | | | Merge branch '51747-gitlab-com-unable-to-import-a-project-that-was-just-expor...Douglas Barbosa Alexandre2018-09-255-4/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add changelog. Add more specs.51747-gitlab-com-unable-to-import-a-project-that-was-just-exportedJames Lopez2018-09-243-0/+10
| | * | | | | | | | | | | Fix null pipeline problemJames Lopez2018-09-244-4/+19
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'docs/version-and-tiers-guidance' into 'master'Marcia Ramos2018-09-251-3/+15
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add clarity to EE feature styles for features introduced before and after 9.2Evan Read2018-09-251-3/+15
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-2537-155/+485
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Refactor Feature.flipper methodmk/improve-usage-of-request-storeMichael Kozono2018-09-242-14/+12
| | * | | | | | | | | | | Use `Gitlab::SafeRequestStore` in more placesMichael Kozono2018-09-2420-81/+67
| | * | | | | | | | | | | Add note to docs about `Gitlab::SafeRequestStore`Michael Kozono2018-09-241-2/+3
| | * | | | | | | | | | | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-2411-60/+21
| | * | | | | | | | | | | Use a null object with RequestStoreMichael Kozono2018-09-244-0/+384
| * | | | | | | | | | | | Merge branch 'nik-doc-postgres-alignment' into 'master'Yorick Peterse2018-09-251-28/+45
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Postgres alignment padding – logic fixed:nik-doc-postgres-alignmentNikolay OOO Sep 14 / Moscow timezone Sep 15-222018-09-201-28/+45
| * | | | | | | | | | | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-09-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Update ldap.mdEd Goforth2018-07-061-1/+1
View Lorry Controller Status