summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-deadlock-chunked-io' into 'master'24280-last-commit-information-in-admin-project-view-is-not-accurateStan Hu2018-11-264-17/+88
|\
| * Fix deadlock on ChunkedIOfix-deadlock-chunked-ioKamil Trzciński2018-11-264-17/+88
* | Merge branch 'force-reload-arguments-1' into 'master'Robert Speicher2018-11-262-1/+7
|\ \
| * | Passing an argument to force an association to reload is now deprecatedJasper Maes2018-11-262-1/+7
* | | Merge branch '54327-profiler-doesn-t-work-with-auth-now' into 'master'Stan Hu2018-11-262-29/+52
|\ \ \
| * | | Allow profiler to authenticate by stubbing users directly54327-profiler-doesn-t-work-with-auth-nowSean McGivern2018-11-262-29/+52
* | | | Merge branch 'ce-rd-extract-ee-specific-sidekiq-queue-config' into 'master'Robert Speicher2018-11-264-7/+14
|\ \ \ \
| * | | | Backport of gitlab-ee!8470ce-rd-extract-ee-specific-sidekiq-queue-configRubén Dávila2018-11-194-7/+14
* | | | | Merge branch '53992-add-events-index-on-project-id-and-created-at' into 'master'Douglas Barbosa Alexandre2018-11-263-1/+39
|\ \ \ \ \
| * | | | | Add events index on project_id and created_atLin Jen-Shin2018-11-263-1/+39
| | |_|/ / | |/| | |
* | | | | Merge branch 'sh-bump-better-errors-gem' into 'master'Robert Speicher2018-11-263-7/+9
|\ \ \ \ \
| * | | | | Upgrade better_errors gem to 2.5.0sh-bump-better-errors-gemStan Hu2018-11-223-7/+9
* | | | | | Merge branch '54407-fix-limited-intersection-observers' into 'master'Tim Zallmann2018-11-262-1/+8
|\ \ \ \ \ \
| * | | | | | Use intersectionRatio to determine intersectionLukas Eipert2018-11-262-1/+8
* | | | | | | Merge branch 'qa-followup-23267-for-qa-branches' into 'master'Rémy Coutable2018-11-261-1/+7
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Override CI_COMMIT_REF_SLUG for QA branchesRémy Coutable2018-11-261-1/+7
* | | | | | | Merge branch 'ce-1979-move-mr-approval-settings' into 'master'Filipa Lacerda2018-11-262-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | CE port of "Move merge request approval settings"ce-1979-move-mr-approval-settingsPaul Slaughter2018-11-162-3/+5
* | | | | | | Merge branch 'gt-update-externalized-strings-from-app-views-project-runners' ...Fatih Acet2018-11-262-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Update externalized strings from `/app/views/project/runners`George Tsiolis2018-11-262-2/+2
* | | | | | | | Merge branch 'i18n-extract-app/views/shared-members' into 'master'Dmitriy Zaporozhets2018-11-266-23/+64
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | i18n: externalize strings from 'app/views/shared/members'Tao Wang2018-11-266-23/+64
* | | | | | | | Merge branch 'dm-batch-loader-key' into 'master'Stan Hu2018-11-2612-57/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Treat Repository instances with the same disk path as the same hash keydm-batch-loader-keyDouwe Maan2018-11-263-3/+15
| * | | | | | | Batch load only data from same repository when lazy object is accessedDouwe Maan2018-11-269-54/+49
* | | | | | | | Merge branch '40260-reduce-gitaly-calls-project-pipeline-status' into 'master'Grzegorz Bizon2018-11-264-110/+34
|\ \ \ \ \ \ \ \
| * | | | | | | | Use strong memoize utilityHeinrich Lee Yu2018-11-261-3/+5
| * | | | | | | | Update testsHeinrich Lee Yu2018-11-262-82/+17
| * | | | | | | | Prevent loading from cache if commit is nilHeinrich Lee Yu2018-11-261-2/+1
| * | | | | | | | Add changelog entryHeinrich Lee Yu2018-11-261-0/+5
| * | | | | | | | Cache project HEAD to prevent unnecessary Gitaly callsHeinrich Lee Yu2018-11-261-26/+9
* | | | | | | | | Merge branch 'fix-null-variables' into 'master'Grzegorz Bizon2018-11-262-4/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow to store null variablesfix-null-variablesKamil Trzciński2018-11-232-4/+4
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch '7527-ci-variables-are-not-parameterized-for-alerting-rules-ce' ...Grzegorz Bizon2018-11-263-5/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Delete 7527-ci-variables-are-not-parameterized-for-alerting-rules-ce.ymlGrzegorz Bizon2018-11-261-5/+0
| * | | | | | | | | Extract query variables into own module7527-ci-variables-are-not-parameterized-for-alerting-rules-cePeter Leitzen2018-11-234-5/+55
* | | | | | | | | | Merge branch 'winh-issue-board-switcher-vue' into 'master'Fatih Acet2018-11-261-2/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor issue boards switcher to single file Vue component (CE-port)winh-issue-board-switcher-vueWinnie Hellmann2018-11-211-2/+1
* | | | | | | | | | | Merge branch 'qa-193-ldap-group-sync-ce' into 'master'Grzegorz Bizon2018-11-2610-13/+63
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | More back portingSanad Liaquat2018-11-262-1/+5
| * | | | | | | | | | Port ee changesSanad Liaquat2018-11-263-23/+30
| * | | | | | | | | | Porting more changes from eeSanad Liaquat2018-11-267-9/+48
| * | | | | | | | | | Add qa classSanad Liaquat2018-11-261-1/+1
* | | | | | | | | | | Merge branch 'winh-vue-test-utils' into 'master'Phil Hughes2018-11-262-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add @vue/test-utils as dev dependencyWinnie Hellmann2018-11-262-0/+8
* | | | | | | | | | | | Merge branch 'gt-externalize-app-views-project-runners' into 'master'Fatih Acet2018-11-266-10/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Externalize strings from `/app/views/project/runners`George Tsiolis2018-11-236-10/+34
* | | | | | | | | | | | Merge branch 'docs/exclude-qa-frontend' into 'master'Rémy Coutable2018-11-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Exclude qa-frontend from running on docs-only branchesdocs/exclude-qa-frontendAchilleas Pipinellis2018-11-231-0/+1
* | | | | | | | | | | | | Merge branch 'docs/ce-to-ee-no-squash' into 'master'Rémy Coutable2018-11-261-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \