summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | | | updated wordWrap option be `on`Phil Hughes2018-04-052-2/+2
| * | | | | | | | added specsPhil Hughes2018-04-052-33/+87
| * | | | | | | | Change IDE diff view responsivelyPhil Hughes2018-04-052-5/+20
* | | | | | | | | Merge branch '43098-controller-projects-issuescontroller-show-executes-more-t...Douwe Maan2018-04-059-28/+124
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix N+1 in MergeRequestParserSean McGivern2018-04-059-28/+124
* | | | | | | | | | Merge branch 'bvl-override-import-params' into 'master'Douwe Maan2018-04-0515-59/+163
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't export `Project#description_html`Bob Van Landuyt2018-04-057-20/+4
| * | | | | | | | | Override values from JSON with import dataBob Van Landuyt2018-04-056-7/+66
| * | | | | | | | | Store override params as import data on projectsBob Van Landuyt2018-04-045-8/+57
| * | | | | | | | | Make the API project params reusableBob Van Landuyt2018-04-042-30/+42
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | 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
| | |_|_|_|_|_|_|/ | |/| | | | | | |