Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Disable Sidekiq when importing a GitLab project from a filesh-fix-issue-48836 | Stan Hu | 2018-07-07 | 1 | -15/+13 |
* | Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma... | Sean McGivern | 2018-07-06 | 31 | -46/+509 |
|\ | |||||
| * | fix spec | James Lopez | 2018-07-06 | 1 | -1/+0 |
| * | fix permissions | James Lopez | 2018-07-06 | 1 | -1/+2 |
| * | Update Import/Export to use object storage (based on aa feature flag) | James Lopez | 2018-07-06 | 31 | -45/+508 |
* | | Merge branch 'docs-update-eks-hostname' into 'master' | Achilleas Pipinellis | 2018-07-06 | 1 | -1/+1 |
|\ \ | |||||
| * | | remove extra tick for eks docs | danielgruesso | 2018-07-06 | 1 | -1/+1 |
* | | | Merge branch 'bw-enable-commonmark-preview' into 'master' | Sean McGivern | 2018-07-06 | 34 | -35/+248 |
|\ \ \ | |/ / |/| | | |||||
| * | | Use proper markdown rendering for previews | Brett Walker | 2018-07-06 | 34 | -35/+248 |
|/ / | |||||
* | | Merge branch 'jlh-gpl-commitment' into 'master' | Jacob Schatz | 2018-07-06 | 1 | -1/+21 |
|\ \ | |||||
| * | | Add GPL Commitment language | Jamie Hurewitz | 2018-07-06 | 1 | -1/+21 |
* | | | Merge branch 'sh-guard-repository-checks' into 'master' | Robert Speicher | 2018-07-06 | 4 | -4/+45 |
|\ \ \ | |||||
| * | | | Add ExclusiveLease guards for RepositoryCheck::{DispatchWorker,BatchWorker} | Stan Hu | 2018-07-06 | 4 | -4/+45 |
* | | | | Merge branch 'docs-make-sure-enabling-omniauth' into 'master' | Achilleas Pipinellis | 2018-07-06 | 2 | -89/+104 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Make it clear that we need to enable omniauth for SAML and Bitbucket | Lin Jen-Shin | 2018-07-06 | 2 | -89/+104 |
|/ / / | |||||
* | | | Merge branch 'ce-5448-move-mailers-previews' into 'master' | Robert Speicher | 2018-07-06 | 6 | -4/+4 |
|\ \ \ | |||||
| * | | | Disable public_send for our preview mailers | Lin Jen-Shin | 2018-07-06 | 1 | -1/+1 |
| * | | | Move spec/mailers/previews to app/mailers/previews | Lin Jen-Shin | 2018-07-06 | 6 | -3/+3 |
* | | | | Merge branch 'bw-add-database-readonly' into 'master' | Robert Speicher | 2018-07-06 | 2 | -0/+44 |
|\ \ \ \ | |||||
| * | | | | Ability to check if underlying database is read only | Brett Walker | 2018-07-06 | 2 | -0/+44 |
|/ / / / | |||||
* | | | | Merge branch 'gitaly-dont-use-path' into 'master' | Sean McGivern | 2018-07-06 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Remove silly use of repo disk path | Jacob Vosmaer | 2018-07-06 | 1 | -2/+2 |
* | | | | | Merge branch 'gitaly-set-delete-config' into 'master' | Nick Thomas | 2018-07-06 | 7 | -12/+109 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Add Repository#set_config and #delete_config | Jacob Vosmaer | 2018-07-06 | 7 | -12/+109 |
* | | | | | Merge branch 'rc-qa-146' into 'master' | Grzegorz Bizon | 2018-07-06 | 18 | -15/+355 |
|\ \ \ \ \ | |||||
| * | | | | | [QA] Add a new scenario to test GitHub import | Rémy Coutable | 2018-07-06 | 18 | -19/+337 |
| * | | | | | [QA] Add a new Page::Issuable::Show page | Rémy Coutable | 2018-07-06 | 2 | -0/+22 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jprovazn-delete-upload-worker' into 'master' | Sean McGivern | 2018-07-06 | 5 | -133/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Delete deprecated object_storage_upload queue | Jan Provaznik | 2018-07-06 | 5 | -133/+6 |
|/ / / / / | |||||
* | | | | | Merge branch 'fl-mr-refactor-performance-improvements' into 'master' | Tim Zallmann | 2018-07-06 | 8 | -55/+90 |
|\ \ \ \ \ | |||||
| * | | | | | Exports getters individually. | Filipa Lacerda | 2018-07-06 | 8 | -55/+90 |
* | | | | | | Merge branch 'pages-1-0-0' into 'master' | Kamil Trzciński | 2018-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update GitLab Pages to v1.0.0 | Nick Thomas | 2018-07-06 | 1 | -1/+1 |
* | | | | | | | Merge branch '46396-recognise-when-a-user-is-trying-to-validate-a-private-ssh... | Phil Hughes | 2018-07-06 | 7 | -3/+162 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | (Part 2) Resolve "Recognise when a user is trying to validate a private SSH key" | Luke Bennett | 2018-07-06 | 7 | -3/+162 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'revert-e76b176d' into 'master' | Clement Ho | 2018-07-06 | 2 | -11/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Revert "Merge branch 'rosulk-patch-12' into 'master'" | Victor Wu | 2018-07-06 | 2 | -11/+5 |
* | | | | | | | | Merge branch '36234-nav-add-groups-dropdown' into 'master' | Phil Hughes | 2018-07-06 | 49 | -1706/+1894 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Resolve "Add dropdown to Groups link in top bar" | Dennis Tang | 2018-07-06 | 49 | -1706/+1894 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'bvl-preload-parents-after-pagination' into 'master' | Douwe Maan | 2018-07-06 | 4 | -16/+44 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Preload ancestors after pagination when filtering | Bob Van Landuyt | 2018-07-06 | 4 | -16/+44 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-ex... | Yorick Peterse | 2018-07-06 | 2 | -1/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | [Rails5] Fix milestone GROUP BY query | blackst0ne | 2018-07-06 | 2 | -1/+7 |
* | | | | | | Merge branch '6653-extract-ee-specific-files-lines-for-discussion-app-service... | Douwe Maan | 2018-07-06 | 1 | -0/+6 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Extract EE-specific lines from NotificationService | Sean McGivern | 2018-07-06 | 1 | -0/+6 |
* | | | | | | Merge branch 'build-chunks-on-object-storage' into 'master' | Grzegorz Bizon | 2018-07-06 | 15 | -216/+1077 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Add spec for the ordering of the data stores | Shinya Maeda | 2018-07-06 | 1 | -0/+16 |
| * | | | | | Merge branch 'master' into build-chunks-on-object-storage | Shinya Maeda | 2018-07-06 | 541 | -22742/+41360 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix spec | Shinya Maeda | 2018-07-04 | 2 | -4/+4 |
| * | | | | | | Make explicit chunks store classes namespace in factroy | Shinya Maeda | 2018-07-04 | 1 | -3/+3 |