summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed the if for the straytz-ide-blob-imageTim Zallmann2018-04-063-9/+11
* Added top Margin to file-info in image viewTim Zallmann2018-04-061-1/+1
* Adapted SCSS Lint rules to allow fallback configuration for cursorsTim Zallmann2018-04-063-0/+5
* Fixed Download Button TestTim Zallmann2018-04-051-3/+4
* Formatting of the Content DisplayTim Zallmann2018-04-054-18/+39
* Added Image + Download Content Viewer to Blob Vewing for the Web IDETim Zallmann2018-04-0511-28/+217
* 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
| | * | | | | | | Create metadata object on build object creationTomasz Maczukin2018-04-043-10/+2
| * | | | | | | | Merge branch 'dm-flatten-tree-plus-chars' into 'master'Robert Speicher2018-04-043-1/+16
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| | * | | | | | | Fix links to subdirectories of a directory with a plus character in its pathdm-flatten-tree-plus-charsDouwe Maan2018-04-043-1/+16
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'zj-opt-out-delete-refs' into 'master'Rémy Coutable2018-04-042-1/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Bulk deleting refs is handled by Gitaly by defaultZeger-Jan van de Weg2018-04-042-1/+7
| | |/ / / / /
| * | | | | | Merge branch 'dz-improve-app-settings-6' into 'master'Filipa Lacerda2018-04-0412-179/+319
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Remove unused form for admin application settingsdz-improve-app-settings-6Dmitriy Zaporozhets2018-04-042-8/+0
| | * | | | | Move the rest of application settings to expandable blocksDmitriy Zaporozhets2018-04-0412-171/+319
| * | | | | | Merge branch 'osw-41401-render-mr-commit-sha-instead-diffs' into 'master'Sean McGivern2018-04-047-5/+84
| |\ \ \ \ \ \
View Lorry Controller Status