summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unused method.ab-37462-cache-personal-projects-countAndreas Brandl2018-04-051-6/+0
* Cache personal projects count.Andreas Brandl2018-04-058-8/+54
* 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
* | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status