summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ignore current RSpec/FactoriesInMigrationSpecs offenses42090-create-cop-for-factorybot-methods-used-in-migration-specsRémy Coutable2018-04-0522-84/+84
* Introduce a new FactoriesInMigrationSpecs copRémy Coutable2018-04-056-1/+122
* Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ...Kamil Trzciński2018-04-0516-152/+208
|\
| * Add CHANGELOG entryTomasz Maczukin2018-04-051-0/+5
| * Update tests for settings/ci_cd_controller_specTomasz Maczukin2018-04-041-11/+35
| * Specify default value for Project#build_timeoutTomasz Maczukin2018-04-043-14/+28
| * Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-0411-127/+141
| * Use ChronicDurationAttribute to handle CI/CD timeout settingTomasz Maczukin2018-04-044-13/+12
* | Merge branch 'jprovazn-comment-refs' into 'master'Sean McGivern2018-04-059-24/+93
|\ \
| * | Better group support notes-related codeJan Provaznik2018-04-059-24/+93
* | | Merge branch 'jacoco' into 'master'Kamil Trzciński2018-04-051-0/+3
|\ \ \
| * | | JaCoCo regex has been added to the examples block of Test coverage parsingRuslan Molchanov2018-03-231-0/+3
* | | | Merge branch 'fix/gb/reschedule-pipeline-stages-migration' into 'master'Kamil Trzciński2018-04-054-24/+44
|\ \ \ \
| * | | | Update entities in pipeline stages migration testGrzegorz Bizon2018-04-051-1/+3
| * | | | Reschedule pipeline stages migration to run it againfix/gb/reschedule-pipeline-stages-migrationGrzegorz Bizon2018-04-054-23/+41
* | | | | Merge branch 'tz-ide-markdown-preview' into 'master'Phil Hughes2018-04-0517-104/+466
|\ \ \ \ \
| * | | | | Web IDE markdown previewTim Zallmann2018-04-0517-104/+466
|/ / / / /
* | | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-056-20/+67
|\ \ \ \ \
| * | | | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-046-20/+67
* | | | | | Merge branch 'dm-internal-user-namespace' into 'master'Sean McGivern2018-04-054-3/+12
|\ \ \ \ \ \
| * | | | | | Update column directly to prevent triggering before_save callbackDouwe Maan2018-04-051-2/+2
| * | | | | | Ensure internal users (ghost, support bot) get assigned a namespacedm-internal-user-namespaceDouwe Maan2018-04-053-1/+10
| |/ / / / /
* | | | | | Merge branch '44710-coverage-information-for-this-repo-is-wrong' into 'master'Grzegorz Bizon2018-04-051-1/+7
|\ \ \ \ \ \
| * | | | | | Fix the coverage job by making it download the artifacts from all the previou...44710-coverage-information-for-this-repo-is-wrongRémy Coutable2018-04-051-1/+7
* | | | | | | Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'mas...Sean McGivern2018-04-058-15/+96
|\ \ \ \ \ \ \
| * | | | | | | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-048-15/+96
* | | | | | | | Merge branch 'ide-sidebar-min-width' into 'master'Filipa Lacerda2018-04-051-56/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | CHanged IDE sidebar min widthide-sidebar-min-widthPhil Hughes2018-04-011-56/+53
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2018-04-0526-16/+563
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'bvl-export-import-lfs' into 'master'Douwe Maan2018-04-0516-7/+392
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | Add helper for accessing lfs_objects for projectBob Van Landuyt2018-04-056-7/+30
| | * | | | | | | Download LFS-files from object storage for exportsBob Van Landuyt2018-04-053-2/+38
| | * | | | | | | Import projects with LFS objectsBob Van Landuyt2018-04-057-3/+195
| | * | | | | | | Export LFS Objects when exporting a projectBob Van Landuyt2018-04-056-3/+137
| * | | | | | | | Merge branch 'zj-opt-out-list-commits-by-oid' into 'master'Sean McGivern2018-04-052-1/+7
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Move ListCommitsByOid to OPT_OUTZeger-Jan van de Weg2018-04-042-1/+7
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'issue_44551' into 'master'Sean McGivern2018-04-057-8/+69
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix 404 in group boards when moving issue between listsissue_44551Felipe Artur2018-04-037-8/+69
| * | | | | | | | | Merge branch 'blackst0ne-rails5-add-rails5-to-gitlab-ci' into 'master'Rémy Coutable2018-04-051-0/+95
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | [Rails5] Add rails5 jobs to gitlab-ci.ymlblackst0ne2018-04-051-0/+95
| |/ / / / / / / /
* | | | | | | | | Merge branch 'security-fixes-to-master' into 'master'Marin Jankovski2018-04-0540-28/+579
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-0535-20/+520
| * | | | | | | | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-053-4/+38
| * | | | | | | | | Merge branch 'fl-fix-milestone-bug-10-6' into 'security-10-6'Phil Hughes2018-04-052-4/+21
|/ / / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-04-04219-1083/+3520
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'fix-typo-in-application_settings-page' into 'master'Robert Speicher2018-04-042-22/+172
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Update locale/gitlab.potRémy Coutable2018-04-041-21/+171
| | * | | | | | | | Fix a typo in an externalized message: 'amd' -> 'and'Rémy Coutable2018-04-041-1/+1
| * | | | | | | | | Merge branch '44922-fix-build-metadata-creation' into 'master'Kamil Trzciński2018-04-045-15/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix sidebar_details_block.vue and simplify build_metadata_entity.rb44922-fix-build-metadata-creationTomasz Maczukin2018-04-042-5/+2