summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add basic export to fix timeout problem on import_file_spec.rbJames Lopez2018-07-071-0/+0
* Merge branch 'perf-wiki-pattern-once' into 'master'Stan Hu2018-07-072-3/+13
|\
| * Add changelog entry for !20465Peter Leitzen2018-07-071-0/+5
| * Improve render performance of large wiki pagesPeter Leitzen2018-07-071-3/+8
|/
* Merge branch '48661-node-6-and-7-compatibility-broken-by-recent-monaco-editor...Tim Zallmann2018-07-073-4/+9
|\
| * add CHANGELOG.md entry for !20461Mike Greiling2018-07-061-0/+5
| * resolve node 6 compatibility issuesMike Greiling2018-07-062-4/+4
* | Merge branch 'sh-add-missing-foreign-key-import-export-uploads' into 'master'James Lopez2018-07-071-0/+1
|\ \
| * | Add missing foreign key in import_export_uploadsStan Hu2018-07-061-0/+1
| |/
* | Merge branch '48670-application-settings-may-not-be-invalidated-if-migrations...Stan Hu2018-07-074-7/+9
|\ \
| * | Stop relying on migrations in the CacheableAttributes cache key and cache att...Rémy Coutable2018-07-054-7/+9
* | | Merge branch 'bw-move-readonly-logic' into 'master'Stan Hu2018-07-073-33/+27
|\ \ \
| * | | Refactor rspec matchers in read_only_spec.rbBrett Walker2018-07-073-33/+27
|/ / /
* | | Merge branch 'redesign-mr-widget-info-pipeline' into 'master'Filipa Lacerda2018-07-0613-235/+449
|\ \ \ | |_|/ |/| |
| * | Redesign for mr widget info and pipelines sectionClement Ho2018-07-0613-235/+449
|/ /
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-0631-46/+509
|\ \
| * | fix specJames Lopez2018-07-061-1/+0
| * | fix permissionsJames Lopez2018-07-061-1/+2
| * | Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-0631-45/+508
* | | Merge branch 'docs-update-eks-hostname' into 'master'Achilleas Pipinellis2018-07-061-1/+1
|\ \ \
| * | | remove extra tick for eks docsdanielgruesso2018-07-061-1/+1
* | | | Merge branch 'bw-enable-commonmark-preview' into 'master'Sean McGivern2018-07-0634-35/+248
|\ \ \ \ | |/ / / |/| | |
| * | | Use proper markdown rendering for previewsBrett Walker2018-07-0634-35/+248
|/ / /
* | | Merge branch 'jlh-gpl-commitment' into 'master'Jacob Schatz2018-07-061-1/+21
|\ \ \
| * | | Add GPL Commitment languageJamie Hurewitz2018-07-061-1/+21
* | | | Merge branch 'sh-guard-repository-checks' into 'master'Robert Speicher2018-07-064-4/+45
|\ \ \ \
| * | | | Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker}Stan Hu2018-07-064-4/+45
* | | | | Merge branch 'docs-make-sure-enabling-omniauth' into 'master'Achilleas Pipinellis2018-07-062-89/+104
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make it clear that we need to enable omniauth for SAML and BitbucketLin Jen-Shin2018-07-062-89/+104
|/ / / /
* | | | Merge branch 'ce-5448-move-mailers-previews' into 'master'Robert Speicher2018-07-066-4/+4
|\ \ \ \
| * | | | Disable public_send for our preview mailersLin Jen-Shin2018-07-061-1/+1
| * | | | Move spec/mailers/previews to app/mailers/previewsLin Jen-Shin2018-07-066-3/+3
* | | | | Merge branch 'bw-add-database-readonly' into 'master'Robert Speicher2018-07-062-0/+44
|\ \ \ \ \
| * | | | | Ability to check if underlying database is read onlyBrett Walker2018-07-062-0/+44
|/ / / / /
* | | | | Merge branch 'gitaly-dont-use-path' into 'master'Sean McGivern2018-07-061-2/+2
|\ \ \ \ \
| * | | | | Remove silly use of repo disk pathJacob Vosmaer2018-07-061-2/+2
* | | | | | Merge branch 'gitaly-set-delete-config' into 'master'Nick Thomas2018-07-067-12/+109
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Add Repository#set_config and #delete_configJacob Vosmaer2018-07-067-12/+109
* | | | | | Merge branch 'rc-qa-146' into 'master'Grzegorz Bizon2018-07-0618-15/+355
|\ \ \ \ \ \
| * | | | | | [QA] Add a new scenario to test GitHub importRémy Coutable2018-07-0618-19/+337
| * | | | | | [QA] Add a new Page::Issuable::Show pageRémy Coutable2018-07-062-0/+22
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jprovazn-delete-upload-worker' into 'master'Sean McGivern2018-07-065-133/+6
|\ \ \ \ \ \
| * | | | | | Delete deprecated object_storage_upload queueJan Provaznik2018-07-065-133/+6
|/ / / / / /
* | | | | | Merge branch 'fl-mr-refactor-performance-improvements' into 'master'Tim Zallmann2018-07-068-55/+90
|\ \ \ \ \ \
| * | | | | | Exports getters individually.Filipa Lacerda2018-07-068-55/+90
* | | | | | | Merge branch 'pages-1-0-0' into 'master'Kamil Trzciński2018-07-061-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Update GitLab Pages to v1.0.0Nick Thomas2018-07-061-1/+1
* | | | | | | | Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh...Phil Hughes2018-07-067-3/+162
|\ \ \ \ \ \ \ \
| * | | | | | | | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key"Luke Bennett2018-07-067-3/+162
|/ / / / / / / /
* | | | | | | | Merge branch 'revert-e76b176d' into 'master'Clement Ho2018-07-062-11/+5
|\ \ \ \ \ \ \ \
View Lorry Controller Status