summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10-7-stable-prepare-rc2' into '10-7-stable'Filipa Lacerda2018-04-06199-3114/+22841
|\
| * Merge remote-tracking branch 'origin/master' into 10-7-stable-prepare-rc210-7-stable-prepare-rc2James Lopez2018-04-06199-3114/+22841
| |\ |/ /
| * Merge branch '43976-fix-access-token-clipboard-button-style' into 'master'Phil Hughes2018-04-063-8/+10
| |\
| | * Fix personal access token clipboard button styleFabian Schneider2018-03-253-8/+10
| * | Merge branch '43215-update-design-for-verifying-domains' into 'master'Phil Hughes2018-04-069-47/+134
| |\ \
| | * | Polish design of domain verification for Gitlab PagesLukas Eipert2018-04-069-47/+134
| |/ /
| * | Merge branch 'sh-appearance-cache-key-version' into 'master'Douwe Maan2018-04-062-1/+6
| |\ \
| | * | Use the GitLab version as part of the appearances cache keysh-appearance-cache-key-versionStan Hu2018-04-052-1/+6
| * | | Merge branch '45070-prometheus-integration-via-kubernetes-is-broken' into 'ma...Kamil Trzciński2018-04-062-0/+6
| |\ \ \
| | * | | Add changelog item45070-prometheus-integration-via-kubernetes-is-brokenJoshua Lambert2018-04-051-0/+5
| | * | | Override the Prometheus server nameJoshua Lambert2018-04-051-0/+1
| * | | | Merge branch '44269-show-failure-reason-on-upgrade-tooltip-of-jobs' into 'mas...Grzegorz Bizon2018-04-0539-38/+635
| |\ \ \ \
| | * | | | Resolve "Show `failure_reason` and upgrade tooltips of jobs"Mayra Cabrera2018-04-0539-38/+635
| |/ / / /
| * | | | Merge branch 'direct-upload-of-artifacts' into 'master'Grzegorz Bizon2018-04-0522-280/+467
| |\ \ \ \
| | * | | | Add `direct_upload` setting for artifactsdirect-upload-of-artifactsKamil Trzciński2018-04-0520-220/+465
| | * | | | Remove artifacts_file/metadata from project exportKamil Trzciński2018-04-052-60/+2
| * | | | | Merge branch 'improve-jobs-queuing-time-metric' into 'master'jramsay-masterKamil Trzciński2018-04-054-4/+104
| |\ \ \ \ \
| | * | | | | Add CHANGELOG entryTomasz Maczukin2018-04-051-0/+5
| | * | | | | Partition job_queue_duration_seconds with jobs_running_for_projectTomasz Maczukin2018-04-053-4/+99
| * | | | | | Merge branch '44389-always-allow-http-for-ci-git-operations' into 'master'Kamil Trzciński2018-04-056-7/+50
| |\ \ \ \ \ \
| | * | | | | | Update documentationTomasz Maczukin2018-04-051-3/+9
| | * | | | | | Add CHANGELOG entryTomasz Maczukin2018-04-051-0/+5
| | * | | | | | Allow HTTP(s) when git request is made by GitLab CITomasz Maczukin2018-04-054-4/+36
| | |/ / / / /
| * | | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' into 'master'Kamil Trzciński2018-04-054-3/+29
| |\ \ \ \ \ \
| | * | | | | | Add change logShinya Maeda2018-04-062-2/+5
| | * | | | | | Fix failed spec44665-fix-db-trace-stream-by-raw-accessShinya Maeda2018-04-051-1/+2
| | * | | | | | Merge branch '44665-fix-db-trace-stream-by-raw-access' of gitlab.com:gitlab-o...Shinya Maeda2018-04-051-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Update jobs_controller.rbShinya Maeda2018-04-031-1/+1
| | | * | | | | | Update jobs_controller.rbShinya Maeda2018-04-031-2/+0
| | | * | | | | | Add testShinya Maeda2018-04-032-2/+22
| | | * | | | | | FixShinya Maeda2018-04-032-12/+22
| | | * | | | | | Fix database trace to read rawShinya Maeda2018-04-032-20/+12
| | * | | | | | | Add testShinya Maeda2018-04-052-2/+22
| | * | | | | | | FixShinya Maeda2018-04-052-12/+22
| | * | | | | | | Fix database trace to read rawShinya Maeda2018-04-052-20/+12
| * | | | | | | | Merge branch 'bvl-port-translations-from-ee' into 'master'Douwe Maan2018-04-0519-2213/+20016
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Merge branch 'master-i18n' into 'master'Douwe Maan2018-04-0519-2213/+20016
| * | | | | | | | | Merge branch 'osw-44295-adjust-authorization-for-discussions-show' into 'master'Sean McGivern2018-04-053-2/+54
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Adjust 404's for LegacyDiffNote discussion renderingOswaldo Ferreira2018-04-053-2/+54
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'docs-45003-route-repository-commits-sha-merge_requests-is-broke...Rémy Coutable2018-04-051-0/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Mention when "/commits/:sha/merge_requests/" endpoint was introducedMark Fletcher2018-04-051-0/+3
| * | | | | | | | | Merge branch '44978-consider-removing-rubocop-and-eslint-from-codeclimate-yml...Robert Speicher2018-04-052-9/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Don't run RuboCop nor ESLint checks in the codequality job as this is already...44978-consider-removing-rubocop-and-eslint-from-codeclimate-ymlRémy Coutable2018-04-042-9/+0
| * | | | | | | | | Merge branch 'pages-0-8-0' into 'master'Robert Speicher2018-04-051-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update GitLab PagesNick Thomas2018-04-051-1/+1
| * | | | | | | | | | Merge branch '44870-remove-extra-space-around-comment-form-on-merge-requests'...Clement Ho2018-04-057-47/+31
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Refactor and tweak margin for note forms on IssuableTakuya Noguchi2018-04-047-47/+31
| * | | | | | | | | | | Merge branch 'ide-diff-inline' into 'master'Filipa Lacerda2018-04-055-39/+114
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fixed eslintPhil Hughes2018-04-051-3/+3
| | * | | | | | | | | | | set `renderSideBySide` when creating diff instancePhil Hughes2018-04-052-1/+7