summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master'Kamil Trzciński2018-04-022-0/+6
|\
| * Extract cluster installed query to scopeMatija Čupić2018-03-301-0/+2
| * Extract installed cluster application scope to concernMatija Čupić2018-03-295-8/+2
| * Merge branch 'master' into 44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-29233-2046/+3630
| |\
| * | Add installed scope to cluster applicationsMatija Čupić2018-03-294-0/+8
| * | Add user_provided and gcp_provided cluster scopesMatija Čupić2018-03-291-0/+2
* | | Merge branch 'tz-ide-open-mr' into 'master'Phil Hughes2018-04-0128-392/+754
|\ \ \
| * | | Fixed Utility Function based on Review CommentsTim Zallmann2018-03-283-11/+4
| * | | Removed strangely added importTim Zallmann2018-03-281-2/+0
| * | | Added Utility Function for WebIDE URLTim Zallmann2018-03-282-2/+13
| * | | Fixed Code review CommentsTim Zallmann2018-03-288-70/+49
| * | | Fixes for ESLint ErrorsTim Zallmann2018-03-282-4/+12
| * | | Fixed Path to tooltip directiveTim Zallmann2018-03-281-1/+1
| * | | Added Changes based on UX ReviewTim Zallmann2018-03-289-63/+100
| * | | Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
| * | | Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-281-23/+20
| * | | Fix for MR Widget Header resetTim Zallmann2018-03-281-43/+43
| * | | Fixes to Formatting to all FilesTim Zallmann2018-03-2814-202/+32
| * | | ESLint + Karma fixesTim Zallmann2018-03-286-82/+26
| * | | Fixed new AdditionsTim Zallmann2018-03-287-11/+15
| * | | Actual MR diff displayedTim Zallmann2018-03-2816-339/+195
| * | | Basic Setup for MR ShowingTim Zallmann2018-03-2823-314/+1006
* | | | 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
View Lorry Controller Status