summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-0523-17/+502
* Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-057-201/+341
|\
| * Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-056-141/+341
| * Remove artifacts_file/metadata from project exportKamil Trzciński2018-04-051-60/+0
* | Merge branch 'improve-jobs-queuing-time-metric' into 'master'jramsay-masterKamil Trzciński2018-04-052-2/+82
|\ \
| * | Partition job_queue_duration_seconds with jobs_running_for_projectTomasz Maczukin2018-04-052-2/+82
* | | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-051-1/+23
|\ \ \
| * | | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-051-1/+23
| |/ /
* | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-051-1/+18
|\ \ \
| * | | Fix failed spec44665-fix-db-trace-stream-by-raw-accessShinya Maeda2018-04-051-1/+2
| * | | Add testShinya Maeda2018-04-051-0/+16
* | | | Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'Sean McGivern2018-04-051-0/+47
|\ \ \ \
| * | | | Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira2018-04-051-0/+47
| |/ / /
* | | | Merge branch 'ide-diff-inline' into 'master'Filipa Lacerda2018-04-052-33/+88
|\ \ \ \
| * | | | set `renderSideBySide` when creating diff instancePhil Hughes2018-04-051-0/+1
| * | | | updated wordWrap option be `on`Phil Hughes2018-04-051-1/+1
| * | | | added specsPhil Hughes2018-04-052-33/+87
* | | | | Merge branch '43098-controller-projects-issuescontroller-show-executes-more-t...Douwe Maan2018-04-054-10/+85
|\ \ \ \ \
| * | | | | Fix N+1 in MergeRequestParserSean McGivern2018-04-054-10/+85
* | | | | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-056-14/+76
|\ \ \ \ \ \
| * | | | | | Don't export `Project#description_html`Bob Van Landuyt2018-04-054-11/+1
| * | | | | | Override values from JSON with import dataBob Van Landuyt2018-04-053-4/+38
| * | | | | | Store override params as import data on projectsBob Van Landuyt2018-04-042-4/+42
* | | | | | | Merge branch 'use-chronic-duration-attribute-for-project-build-timeout' into ...Kamil Trzciński2018-04-055-89/+136
|\ \ \ \ \ \ \
| * | | | | | | Update tests for settings/ci_cd_controller_specTomasz Maczukin2018-04-041-11/+35
| * | | | | | | Specify default value for Project#build_timeoutTomasz Maczukin2018-04-041-10/+24
| * | | | | | | Move leftovers from pipelines_settings_controller to settings/ci_cd_controllerTomasz Maczukin2018-04-044-79/+88
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'jprovazn-comment-refs' into 'master'Sean McGivern2018-04-052-0/+32
|\ \ \ \ \ \ \
| * | | | | | | Better group support notes-related codeJan Provaznik2018-04-052-0/+32
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'fix/gb/reschedule-pipeline-stages-migration' into 'master'Kamil Trzciński2018-04-051-3/+5
|\ \ \ \ \ \ \
| * | | | | | | 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-051-2/+2
* | | | | | | | Web IDE markdown previewTim Zallmann2018-04-054-11/+127
* | | | | | | | Merge branch 'direct-upload-of-uploads' into 'master'Grzegorz Bizon2018-04-051-4/+34
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Allow to store uploads by default on Object Storagedirect-upload-of-uploadsKamil Trzciński2018-04-041-4/+34
* | | | | | | | Merge branch 'dm-internal-user-namespace' into 'master'Sean McGivern2018-04-052-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | 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-051-0/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'ce-4474-custom-additional-text-in-confirmation-email' into 'mas...Sean McGivern2018-04-053-10/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | Add custom additonal email text to all emailsce-4474-custom-additional-text-in-confirmation-emailEric Eastwood2018-04-043-10/+83
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2018-04-059-2/+306
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'bvl-export-import-lfs' into 'master'Douwe Maan2018-04-056-0/+260
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Add helper for accessing lfs_objects for projectBob Van Landuyt2018-04-051-0/+16
| | * | | | | | Download LFS-files from object storage for exportsBob Van Landuyt2018-04-051-1/+23
| | * | | | | | Import projects with LFS objectsBob Van Landuyt2018-04-054-1/+141
| | * | | | | | Export LFS Objects when exporting a projectBob Van Landuyt2018-04-052-0/+82
| | |/ / / / /
| * | | | | | Merge branch 'issue_44551' into 'master'Sean McGivern2018-04-053-2/+46
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix 404 in group boards when moving issue between listsissue_44551Felipe Artur2018-04-033-2/+46
* | | | | | | Merge branch 'jej/mattermost-notification-confidentiality-10-6' into 'securit...Douwe Maan2018-04-0514-9/+302
* | | | | | | Merge branch '42028-xss-diffs-10-6' into 'security-10-6'Douwe Maan2018-04-051-2/+28