summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add EE fixtures to SeedFu pathinclude-ee-fixturesBalasankar "Balu" C2019-05-102-0/+9
* Merge branch 'winh-simplify-frontend-fixtures' into 'master'Rémy Coutable2019-05-1030-165/+98
|\
| * Remove trailing empty lineswinh-simplify-frontend-fixturesWinnie Hellmann2019-05-102-6/+0
| * Remove unused fixture_file_name parametersWinnie Hellmann2019-05-103-20/+20
| * Remove example block parametersWinnie Hellmann2019-05-1027-56/+56
| * Remove duplicate store_frontend_fixture() callsWinnie Hellmann2019-05-1027-44/+0
| * Merge balsamiq fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| * Merge PDF fixture into raw file fixturesWinnie Hellmann2019-05-102-18/+7
| * Expose response variable for raw file fixturesWinnie Hellmann2019-05-101-7/+8
| * Call store_frontend_fixture() in JavaScriptFixturesHelpersWinnie Hellmann2019-05-101-7/+11
* | Merge branch '60180-jira-service-fix-nil-on-find-call-pderichs' into 'master'12-0-auto-deploy-0009600Rémy Coutable2019-05-103-0/+13
|\ \
| * | Resolve "JIRA service: NoMethodError: undefined method `find' for nil:NilClass"Patrick Derichs2019-05-103-0/+13
|/ /
* | Merge branch 'sh-revert-full-gc-after-import' into 'master'Rémy Coutable2019-05-102-2/+2
|\ \
| * | Don't run full gc in AfterImportServicesh-revert-full-gc-after-importStan Hu2019-05-102-2/+2
|/ /
* | Merge branch 'lets-encrypt-docs' into 'master'Rémy Coutable2019-05-101-2/+2
|\ \
| * | Update option to enforce HTTPSgfyoung2019-05-101-2/+2
|/ /
* | Merge branch 'sh-fix-invited-members' into 'master'Rémy Coutable2019-05-103-2/+27
|\ \
| * | Fix Error 500 when inviting user already presentStan Hu2019-05-103-2/+27
|/ /
* | Merge branch 'fix-60425' into 'master'Nick Thomas2019-05-099-19/+31
|\ \
| * | Change DetectRepositoryLanguagesWorker to not receive userDiego Silva2019-05-099-19/+31
* | | Merge branch '61635-flaky-spec-dashboard-user_filters_projects_spec' into 'ma...Stan Hu2019-05-091-44/+12
|\ \ \
| * | | Fix a flaky spec for sorting projects in dashboard61635-flaky-spec-dashboard-user_filters_projects_specRémy Coutable2019-05-091-44/+12
* | | | Merge branch '6659-extract-ee-specific-files-lines-for-spec-lib-gitlab-easier...Yorick Peterse2019-05-091-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Update usage_data_spec to match EEJames Lopez2019-05-091-2/+2
|/ / /
* | | Merge branch 'whitelist-gitaly-when-forking-project' into 'master'Rémy Coutable2019-05-091-6/+17
|\ \ \
| * | | Whitelist Gitaly N+1 for forking in testsNick Thomas2019-05-091-6/+17
* | | | Merge branch 'ce-jej/group-saml-project-enforcement' into 'master'Nick Thomas2019-05-091-0/+4
|\ \ \ \
| * | | | SSO enforcement for project resourcesce-jej/group-saml-project-enforcementJames Edwards-Jones2019-05-081-0/+4
* | | | | Merge branch 'patch-29' into 'master'Fatih Acet2019-05-091-1/+1
|\ \ \ \ \
| * | | | | Open merge collab link in new tabtrojkilla2019-05-091-1/+1
|/ / / / /
* | | | | Merge branch 'support-string-piwik-website-ids' into 'master'Phil Hughes2019-05-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Adds quotes to Matomo/Piwik website IDCDuv2019-05-081-1/+1
* | | | | Merge branch '6105-move-ee-differences-group-members' into 'master'Phil Hughes2019-05-091-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | CE: Move EE differences for6105-move-ee-differences-group-membersDonald Cook2019-05-071-0/+2
* | | | | Merge branch 'acme-account-private-key' into 'master'Grzegorz Bizon2019-05-092-1/+17
|\ \ \ \ \
| * | | | | Generate Let's Encrypt private keyVladimir Shushlin2019-05-092-1/+17
|/ / / / /
* | | | | Merge branch 'patch-17' into 'master'Phil Hughes2019-05-091-2/+1
|\ \ \ \ \
| * | | | | doc: administration/planutml: update instructions for setting dialogsElan Ruusamäe2019-05-091-2/+1
* | | | | | Merge branch 'sh-upgrade-ruby-2.6.3-ce' into 'master'Rémy Coutable2019-05-0914-20/+26
|\ \ \ \ \ \
| * | | | | | Upgrade Ruby version to 2.6.3sh-upgrade-ruby-2.6.3-ceStan Hu2019-05-0814-20/+26
* | | | | | | Merge branch 'add-warning-to-backup-rake-task' into 'master'Rémy Coutable2019-05-092-0/+13
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add warning that gitlab-secrets isn't includedadd-warning-to-backup-rake-taskCindy Pallares2019-05-082-0/+13
* | | | | | | Merge branch 'antonyliu-i18n-user-profile' into 'master'Rémy Coutable2019-05-095-11/+46
|\ \ \ \ \ \ \
| * | | | | | | i18n: externalize strings from user profile settingsantony liu2019-05-095-11/+46
|/ / / / / / /
* | | | | | | Merge branch '61596-increase-timeout-for-discussion-notes-spec' into 'master'Phil Hughes2019-05-091-2/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix discussion notes spec timeout61596-increase-timeout-for-discussion-notes-specPaul Slaughter2019-05-081-2/+5
| |/ / / / /
* | | | | | Merge branch 'jl-improve-component-table-clarity-docs' into 'master'Sid Sijbrandij2019-05-081-3/+5
|\ \ \ \ \ \
| * | | | | | Add hline between table and chart, improve grammarJoshua Lambert2019-05-081-3/+5
* | | | | | | Merge branch 'admin-projects-show-scb' into 'master'Phil Hughes2019-05-081-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Resolve CE/EE diffs in admin/projects/show viewadmin-projects-show-scbLuke Bennett2019-05-081-0/+2
| |/ / / / /
View Lorry Controller Status