summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-303-13/+50
* Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-302-0/+7
|\
| * changed the way of nullifying columshaseeb2018-03-052-1/+5
| * nullify closed by on reopenning issuehaseeb2018-03-031-0/+1
| * removed hasmany association from usershaseeb2018-02-281-1/+0
| * added forign key and specshaseeb2018-02-281-0/+1
| * closed by field addedhaseeb2018-02-282-0/+2
* | Merge branch 'sh-cleanup-pages-worker' into 'master'Nick Thomas2018-03-301-0/+3
|\ \
| * | Free open file descriptors and libgit2 buffers in UpdatePagesServicesh-cleanup-pages-workerStan Hu2018-03-301-0/+3
* | | Merge branch 'fix/projects-no-repository-placeholder' into 'master'Rémy Coutable2018-03-304-5/+7
|\ \ \
| * | | Use translated string for breadcrumb titleGeorge Tsiolis2018-03-294-4/+4
| * | | Update translated stringsGeorge Tsiolis2018-03-271-1/+1
| * | | Update no repository placeholderGeorge Tsiolis2018-03-261-1/+3
* | | | Merge branch 'ac/pages-port' into 'master'Nick Thomas2018-03-302-14/+12
|\ \ \ \
| * | | | Add port number to artifacts links to gitlab-pages, if neededAlessio Caiazza2018-03-292-14/+12
* | | | | Merge branch 'add-milestone-path-to-dashboard-milestones-breadcrumb-link' int...Rémy Coutable2018-03-301-2/+3
|\ \ \ \ \
| * | | | | Update dashboard milestones breadcrumb linkGeorge Tsiolis2018-03-221-2/+3
* | | | | | Merge branch 'osw-order-boards-by-name' into 'master'Sean McGivern2018-03-301-1/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | [Backport] Order boards alphabeticallyosw-order-boards-by-nameoswaldoferreira2018-03-281-1/+5
* | | | | | Merge branch 'brancho/gitlab-ce-Link_to_project_labels_page' into 'master'Sean McGivern2018-03-291-1/+1
|\ \ \ \ \ \
| * | | | | | Always display Labels section in issuable sidebar, even when the project has ...brancho/gitlab-ce-Link_to_project_labels_pageBranka Martinovic2018-03-291-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'escape-autocomplete-values-for-markdown' into 'master'Phil Hughes2018-03-291-5/+14
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Escape autocomplete results for MarkdownSean McGivern2018-03-291-5/+14
* | | | | | Merge branch 'add-per-runner-job-timeout' into 'master'Kamil Trzciński2018-03-2913-6/+185
|\ \ \ \ \ \
| * | | | | | Remove Ci::Build#timeoutTomasz Maczukin2018-03-281-4/+2
| * | | | | | Add explicit primary key for ci_builds_metadata tableTomasz Maczukin2018-03-281-0/+1
| * | | | | | Change and rename behavior of save_timeout_state!Tomasz Maczukin2018-03-282-3/+3
| * | | | | | Refactorize ChronicDurationAttribute concernTomasz Maczukin2018-03-281-31/+20
| * | | | | | Refactor build_metadataTomasz Maczukin2018-03-284-19/+15
| * | | | | | Add validation for max_timeout in Ci::RunnerTomasz Maczukin2018-03-281-0/+4
| * | | | | | Add validation for chronic_duration_attr_writerTomasz Maczukin2018-03-281-4/+23
| * | | | | | Add project_id column to Ci::BuildMetadataTomasz Maczukin2018-03-281-0/+11
| * | | | | | Rename metadata relation and methodsTomasz Maczukin2018-03-282-6/+8
| * | | | | | BuildMetadata styling improvementsTomasz Maczukin2018-03-281-5/+5
| * | | | | | Rename used_timeout to timeoutTomasz Maczukin2018-03-284-7/+7
| * | | | | | Rename maximum_job_timeout to maximum_timeoutTomasz Maczukin2018-03-284-6/+6
| * | | | | | Fix tests failuresTomasz Maczukin2018-03-281-2/+2
| * | | | | | Use help_page_path helper to generate runner_help_urlTomasz Maczukin2018-03-281-1/+1
| * | | | | | Refactorize Ci::Build and Ci::BuildMetadata modelsTomasz Maczukin2018-03-282-12/+18
| * | | | | | Fix transition failure when metadata not existsTomasz Maczukin2018-03-281-1/+1
| * | | | | | Fix static analysis offencesTomasz Maczukin2018-03-283-5/+1
| * | | | | | Move job timeout information to new ci_builds_metadata tableTomasz Maczukin2018-03-287-32/+67
| * | | | | | Change timeout_source to enumTomasz Maczukin2018-03-283-5/+26
| * | | | | | Downcase timeout_source valueTomasz Maczukin2018-03-281-1/+1
| * | | | | | Properly handle empty value for chronic duration attributeTomasz Maczukin2018-03-281-1/+7
| * | | | | | Remove unused methodTomasz Maczukin2018-03-281-4/+0
| * | | | | | Refactor timeout selection mechanismTomasz Maczukin2018-03-281-8/+2
| * | | | | | Add few frontend improvementsTomasz Maczukin2018-03-284-3/+13
| * | | | | | Remove information about maximum_job_timeout from runners listsTomasz Maczukin2018-03-283-8/+0
| * | | | | | Replace user_readable with human_readableTomasz Maczukin2018-03-287-9/+9