summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Don't set timeago title to what was already there.bvl-dont-reset-timeago-titleBob Van Landuyt2017-12-071-2/+0
* Merge branch '27742-display-member-role-per-project' into 'master'Phil Hughes2017-12-0722-94/+347
|\
| * Resolve "Display member role per project"Mike Greiling2017-12-0722-94/+347
|/
* Merge branch 'fj-40752-forks-api-not-using-services' into 'master'Douwe Maan2017-12-076-173/+271
|\
| * The API isn't using the appropriate services for managing forksFrancisco Javier López2017-12-076-173/+271
|/
* Merge branch 'rs-bump-shell' into 'master'Douwe Maan2017-12-071-1/+1
|\
| * Bump GITLAB_SHELL_VERSIONrs-bump-shellRobert Speicher2017-12-061-1/+1
* | Merge branch 'docs-pages-admin-update' into 'master'Achilleas Pipinellis2017-12-071-0/+3
|\ \
| * | add note on deploying Pages to a private networkdocs-pages-admin-updateMarcia Ramos2017-12-061-0/+3
| |/
* | Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master'Stan Hu2017-12-0714-4/+1323
|\ \
| * | Fix specs for MySQLMichael Kozono2017-12-062-0/+5
| * | Fix specs after rebaseMichael Kozono2017-12-064-89/+20
| * | Process normal paths in batch containing bad pathsMichael Kozono2017-12-052-4/+45
| * | Guarantee all IDs are includedMichael Kozono2017-12-051-5/+5
| * | Make sure empty uploads doesn’t break anythingMichael Kozono2017-12-041-1/+9
| * | Follow symlinksMichael Kozono2017-12-041-1/+1
| * | Handle race conditionMichael Kozono2017-12-011-1/+2
| * | Add tests for disable_quote optionMichael Kozono2017-12-011-0/+16
| * | Address Rubocop offensesMichael Kozono2017-12-012-39/+82
| * | Fix test for MySQLMichael Kozono2017-12-011-4/+6
| * | Ensure consistent column orderMichael Kozono2017-12-011-1/+1
| * | Don’t quote `NOW()` for created_at columnMichael Kozono2017-12-012-3/+9
| * | RefactorMichael Kozono2017-12-011-6/+6
| * | Don’t recreate deleted uploadsMichael Kozono2017-12-013-12/+51
| * | Get rid of timestamps on untracked files tableMichael Kozono2017-12-011-3/+2
| * | Bulk insert uploadsMichael Kozono2017-12-011-49/+14
| * | Filter existing uploads with one queryMichael Kozono2017-12-012-92/+68
| * | RefactorMichael Kozono2017-12-012-16/+13
| * | Get rid of tracked fieldMichael Kozono2017-12-013-29/+7
| * | RefactorMichael Kozono2017-12-011-10/+3
| * | Fix datetime inserts on MySQLMichael Kozono2017-12-011-3/+1
| * | Fix Rubocop offenseMichael Kozono2017-12-011-0/+1
| * | Use bulk insertsMichael Kozono2017-12-013-71/+184
| * | Use ionice absolute pathMichael Kozono2017-12-011-2/+3
| * | Attempt to fix spec in CIMichael Kozono2017-12-011-1/+1
| * | Log the find command usedMichael Kozono2017-12-011-0/+2
| * | Move temp table creation into the prepare jobMichael Kozono2017-12-016-77/+76
| * | Fix migration for pre-Postgres 9.5Michael Kozono2017-12-011-1/+15
| * | Fix Rubocop offensesMichael Kozono2017-12-014-11/+9
| * | Drop temporary tracking table when finishedMichael Kozono2017-12-016-92/+131
| * | Refactor specsMichael Kozono2017-12-014-337/+183
| * | Speed up insertsMichael Kozono2017-12-011-2/+4
| * | Fallback on checksum jobsMichael Kozono2017-12-011-0/+2
| * | Remove irrelevant copy-pasted codeMichael Kozono2017-12-011-20/+0
| * | Fix uploads.path length for long filenamesMichael Kozono2017-12-012-1/+26
| * | Fix MySQL path field lengthMichael Kozono2017-12-011-1/+1
| * | Store paths relative to CarrierWave.rootMichael Kozono2017-12-015-68/+79
| * | Fix `ionice` prependMichael Kozono2017-12-011-1/+1
| * | Exclude `untracked_files_for_uploads` from schemaMichael Kozono2017-12-011-10/+0
| * | Clean up after testMichael Kozono2017-12-011-1/+7
View Lorry Controller Status