summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '45120-fix-ide-editor-to-update-size-on-show-change' into 'master'Phil Hughes2019-07-011-7/+27
|\
| * Fix IDE editor to update dimensions on show change45120-fix-ide-editor-to-update-size-on-show-changePaul Slaughter2019-06-281-7/+27
* | Merge branch 'add-clusters-to-deployment' into 'master'Lin Jen-Shin2019-07-012-1/+18
|\ \
| * | Use #cluster for prometheus_adapteradd-clusters-to-deploymentThong Kuah2019-06-271-1/+16
| * | Populate cluster_id when creating a deploymentThong Kuah2019-06-271-0/+1
| * | Add cluster_id to deployments table as an FKThong Kuah2019-06-271-0/+1
* | | Allow collapsing all issue boardsMartin Hanzel2019-06-285-55/+125
* | | Vue-i18n: javascripts/boards directoryEzekiel Kigbo2019-06-2810-57/+70
* | | Merge branch 'leipert-absolute-scss-paths' into 'master'Mike Greiling2019-06-284-12/+12
|\ \ \
| * | | Use absolute paths for SCSS importsLukas Eipert2019-06-284-12/+12
* | | | Merge branch '10087-settings-pannel' into 'master'63463-follow-up-from-insights-is-now-ga62296-conform-on-single-icon-for-dropdown-buttons-which-align-with-design-systemPhil Hughes2019-06-282-27/+55
|\ \ \ \
| * | | | Moves EE code into a mixin10087-settings-pannelFilipa Lacerda2019-06-282-27/+55
* | | | | Merge branch 'last-commit-widget-api-call' into 'master'Filipa Lacerda2019-06-285-85/+92
|\ \ \ \ \
| * | | | | Use GraphQL API to fetch last commit data for treePhil Hughes2019-06-285-85/+92
* | | | | | Merge branch 'small-s-in-elasticsearch-in-code' into 'master'Rémy Coutable2019-06-281-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in code comments about ElasticsearchTakuya Noguchi2019-06-281-1/+1
* | | | | | | Replace 'JIRA' with 'Jira'Takuya Noguchi2019-06-281-12/+12
| |_|_|/ / / |/| | | | |
* | | | | | added code difference in `app/views/search/_category.html.haml` from EE to CEMichel Engelen2019-06-281-0/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'graphql-tree-last-commit' into 'master'Lin Jen-Shin2019-06-284-1/+47
|\ \ \ \ \
| * | | | | Added commit type to tree GraphQL typePhil Hughes2019-06-284-1/+47
* | | | | | Merge branch 'id-extract-widget-into-different-request' into 'master'Ash McKenzie2019-06-287-12/+41
|\ \ \ \ \ \
| * | | | | | Extract MR's widget into a separate endpointid-extract-widget-into-different-requestIgor Drozdov2019-06-287-12/+41
* | | | | | | Do not change updated_at on an issue when reordering on an issue boardEugenia Grieff2019-06-282-4/+13
* | | | | | | Merge branch 'sh-fix-issue-12303' into 'master'Grzegorz Bizon2019-06-281-1/+9
|\ \ \ \ \ \ \
| * | | | | | | Backport CE changes for multiple GroupSAML supportsh-fix-issue-12303Stan Hu2019-06-271-1/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '62968-environment-details-header-border-misaligned' into 'master'Kushal Pandya2019-06-281-15/+13
|\ \ \ \ \ \ \
| * | | | | | | Align page header for environment details view62968-environment-details-header-border-misalignedDave Pisek2019-06-281-15/+13
| |/ / / / / /
* | | | | | | Merge branch 'ce-11098-update-merge-request-settings-description-text' into '...Filipa Lacerda2019-06-282-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Update project MR setting section description (CE)Nathan Friend2019-06-252-1/+2
* | | | | | | | Merge branch '6360-tree-header' into 'master'Phil Hughes2019-06-281-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes EE differences6360-tree-headerFilipa Lacerda2019-06-271-0/+1
* | | | | | | | | Merge branch '63212-n-1-queries-in-projects-id-boards-api' into 'master'Thong Kuah2019-06-282-1/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Move order lambda to list scope63212-n-1-queries-in-projects-id-boards-apicharlieablett2019-06-272-2/+3
| * | | | | | | | | Compound lists scopes to preserve orderingcharlieablett2019-06-261-1/+1
| * | | | | | | | | Remove `with_associations` from BoardSerializercharlieablett2019-06-261-8/+0
| * | | | | | | | | Remove N+1 query for project and group boardscharlieablett2019-06-262-0/+11
* | | | | | | | | | Merge branch 'vue-i18n-js-performance-bar-directory' into 'master'Kushal Pandya2019-06-282-7/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Namespace performance bar translationsvue-i18n-js-performance-bar-directoryEzekiel Kigbo2019-06-282-7/+9
| * | | | | | | | | | Vue-i18n: app/assets/javascripts/performance_bar/ directoryEzekiel Kigbo2019-06-271-6/+8
* | | | | | | | | | | Merge branch '62826-graphql-emoji-mutations' into 'master'Jan Provaznik2019-06-2811-0/+237
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | GraphQL mutations for add, remove and toggle emoji62826-graphql-emoji-mutationsLuke Duncalfe2019-06-2811-0/+237
* | | | | | | | | | | | Rearrange discussion resolve buttons & update button displaySamantha Ming2019-06-284-20/+26
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'remove_group_and_instance_clusters_feature_flag' into 'master'Stan Hu2019-06-277-35/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove instance_clusters feature_flagremove_group_and_instance_clusters_feature_flagThong Kuah2019-06-283-13/+2
| * | | | | | | | | | Remove group_clusters feature flagThong Kuah2019-06-285-22/+2
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'dohtaset' into 'master'Mike Greiling2019-06-271-4/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix charts on Cluster pagedohtasetSimon Knox2019-06-271-4/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '11888-regression-deploy-correlation-markers-on-monitoring-graph...Clement Ho2019-06-272-3/+12
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Turn commit sha in monitor charts popover to link11888-regression-deploy-correlation-markers-on-monitoring-graphs-not-clickableDhiraj Bodicherla2019-06-262-3/+12
* | | | | | | | | | | Merge branch '12429-report' into 'master'Phil Hughes2019-06-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \