summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '44291-usage-ping-for-kubernetes-integration' into 'master'Kamil Trzciński2018-04-0210-0/+125
|\
| * Extract cluster installed query to scopeMatija Čupić2018-03-303-1/+15
| * 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-29836-5649/+14214
| |\
| * | Change order of queries for gcp cluster usage data countMatija Čupić2018-03-291-1/+1
| * | Use cluster scopes to deflate usage data implementationMatija Čupić2018-03-291-6/+6
| * | Add installed scope to cluster applicationsMatija Čupić2018-03-298-0/+56
| * | Add user_provided and gcp_provided cluster scopesMatija Čupić2018-03-292-0/+26
| * | Query GCP provider table instead of selecting clustersMatija Čupić2018-03-291-1/+1
| * | Check cluster usage datapoint counts44291-usage-ping-for-kubernetes-integrationMatija Čupić2018-03-271-0/+17
| * | Make cluster usage datapoints more specificMatija Čupić2018-03-261-6/+6
| * | Rename cluster datapoint names to be more specificMatija Čupić2018-03-262-12/+12
| * | Disable rubocop Metrics/AbcSize on UsageData#system_usage_dataMatija Čupić2018-03-221-0/+1
| * | Add CHANGELOGMatija Čupić2018-03-221-0/+5
| * | Add additional cluster usage metricsMatija Čupić2018-03-222-0/+12
* | | Merge branch 'tz-ide-open-mr' into 'master'Phil Hughes2018-04-0141-573/+1380
|\ \ \
| * | | 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-2811-94/+61
| * | | 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-2810-64/+101
| * | | Updated MR Widget Header TestTim Zallmann2018-03-281-106/+138
| * | | Re added The Web IDE ButtonTim Zallmann2018-03-281-43/+54
| * | | Added Tests for all new functionalityTim Zallmann2018-03-2811-74/+485
| * | | Fixes for Tests on file.js and tabs testsTim Zallmann2018-03-282-23/+21
| * | | 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-287-83/+40
| * | | 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
* | | | Merge branch 'theothertom/gitlab-ce-bug/42663/update-jira-integration-docs-fo...Rémy Coutable2018-03-302-1/+14
|\ \ \ \
| * | | | Copyedit JIRA docsAchilleas Pipinellis2018-03-301-5/+9
| * | | | Update Jira integration docs for new Jira UITom Grace2018-02-022-1/+10
* | | | | Merge branch 'fj-42685-extend-project-export-endpoint' into 'master'Douwe Maan2018-03-3019-25/+671
|\ \ \ \ \
| * | | | | Extend API for exporting a project with direct upload URLFrancisco Javier López2018-03-3019-25/+671
|/ / / / /
* | | | | Merge branch '41967_issue_api_closed_by_info' into 'master'Sean McGivern2018-03-3011-1/+90
|\ \ \ \ \
| * | | | | added missing space in docs and a changeloghaseeb2018-03-062-2/+7
| * | | | | changed the way of nullifying columshaseeb2018-03-052-1/+5
| * | | | | note addedhaseeb2018-03-031-0/+21
| * | | | | nullify closed by on reopenning issuehaseeb2018-03-031-0/+1
| * | | | | closed by added to all_models.ymlhaseeb2018-03-011-0/+1
| * | | | | closedby_id added to safe attributeshaseeb2018-03-012-2/+2
| * | | | | added new field into safe modelhaseeb2018-02-281-0/+1
| * | | | | removed hasmany association from usershaseeb2018-02-281-1/+0
| * | | | | schema version changehaseeb2018-02-281-1/+1
| * | | | | documentation updatedhaseeb2018-02-281-0/+27
| * | | | | schema version changehaseeb2018-02-281-1/+1