summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43460-track-projects-a-user-contributed-to' into 'master'Yorick Peterse2018-03-072-0/+67
|\
| * Shortcut and return on duplicate record error.43460-track-projects-a-user-contributed-toAndreas Brandl2018-03-061-3/+3
| * Nested transaction for find_or_create_by! queries.Andreas Brandl2018-03-061-5/+11
| * Remove unnecessary safe guard.Andreas Brandl2018-03-061-6/+0
| * Operate on ids to avoid unnecessary loading.Andreas Brandl2018-03-061-3/+3
| * Singularize model name.Andreas Brandl2018-03-062-2/+2
| * Rename to UserInteractedProjects.Andreas Brandl2018-03-062-5/+5
| * Flush cached information about schema.Andreas Brandl2018-03-061-0/+6
| * Only track contributions if table is available.Andreas Brandl2018-03-062-1/+12
| * Address rubocop offenses.Andreas Brandl2018-03-061-28/+30
| * Treat special cases accordingly.Andreas Brandl2018-03-061-1/+15
| * Cache project/user combinations.Andreas Brandl2018-03-061-3/+19
| * Track which projects a user contributed to.Andreas Brandl2018-03-062-0/+18
* | Merge branch 'dz-plugins-project-integrations' into 'master'Dmitriy Zaporozhets2018-03-073-50/+73
|\ \
| * | Remove plugins from project integrations pageDmitriy Zaporozhets2018-03-062-6/+9
| * | Remove boolean icons from plugins pageDmitriy Zaporozhets2018-03-051-1/+0
| * | Render plugins list on system hooks pageDmitriy Zaporozhets2018-03-053-53/+53
| * | Show plugins list on project integrations pageDmitriy Zaporozhets2018-03-052-0/+21
* | | Unify deployment_platform interface with EELin Jen-Shin2018-03-072-2/+3
* | | Merge branch '43502-clipboard-btn' into 'master'Phil Hughes2018-03-076-2/+8
|\ \ \
| * | | Removes btn-transparent and btn-clipboard as default classes for clipboard bu...43502-clipboard-btnFilipa Lacerda2018-03-066-2/+8
* | | | Merge branch 'sh-make-prune-optional-in-git-fetch' into 'master'43962-add-wip-to-merge-requests-titles-by-default43958-include-adding-a-specific-runner-to-another-project-from-the-admin-area-to-docsNick Thomas2018-03-071-4/+4
|\ \ \ \
| * | | | Make --prune a configurable parameter in fetching a git remotesh-make-prune-optional-in-git-fetchStan Hu2018-03-061-4/+4
* | | | | Remove common_vue bundleMike Greiling2018-03-0610-23/+1
| |/ / / |/| | |
* | | | Merge branch 'move-pipeline_default-update_head_pipeline_for_merge_request-qu...Kamil Trzciński2018-03-062-1/+3
|\ \ \ \
| * | | | Change queue namespace of UpdateHeadPipelineForMergeRequestWorkerShinya Maeda2018-03-071-0/+2
| * | | | Move update_head_pipeline_for_merge_request queue to pipeline_processing name...Shinya Maeda2018-03-071-1/+1
* | | | | Merge branch 'ce-3727-fe-labels-for-epics' into 'master'Filipa Lacerda2018-03-063-5/+7
|\ \ \ \ \
| * | | | | Backport description composition from EEce-3727-fe-labels-for-epicsKushal Pandya2018-03-061-2/+4
| * | | | | Add `js-*` class to refer in JSKushal Pandya2018-03-062-3/+3
| | |/ / / | |/| | |
* | | | | Merge branch 'cluster-monitoring-changes-ce-backport' into 'master'Phil Hughes2018-03-0610-63/+173
|\ \ \ \ \
| * | | | | move misplaced entry pointcluster-monitoring-changes-ce-backportMike Greiling2018-03-061-0/+0
| * | | | | coerce hasMetrics to a boolean value before instantiating the Vue componentMike Greiling2018-03-062-5/+9
| * | | | | prefer getElementByIdMike Greiling2018-03-061-1/+1
| * | | | | remove prometheus panel styling on cluster monitoring pageMike Greiling2018-03-062-1/+21
| * | | | | lighten axis tick textMike Greiling2018-03-061-1/+2
| * | | | | add ability to override graph size measurementsMike Greiling2018-03-062-1/+12
| * | | | | fix spacing around axis label text in small breakpointsMike Greiling2018-03-061-2/+3
| * | | | | hide legend without hiding the axis labelsMike Greiling2018-03-062-35/+42
| * | | | | add option to hide the graph legendMike Greiling2018-03-062-1/+15
| * | | | | use proper dependency injection for monitoring dashboard componentMike Greiling2018-03-063-23/+69
| * | | | | make deployments endpoint optionalMike Greiling2018-03-061-0/+3
| * | | | | add prometheus cluster health monitoring empty stateMike Greiling2018-03-061-1/+4
* | | | | | Merge branch 'issue_38337' into 'master'Sean McGivern2018-03-0635-83/+435
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'master' into 'issue_38337'Felipe Artur2018-03-06203-4223/+1567
| |\ \ \ \ \
| * | | | | | Fix a typo, a conflict and improve documentationissue_38337Felipe Artur2018-03-061-1/+1
| * | | | | | Address review commentsFelipe Artur2018-03-053-15/+12
| * | | | | | Bring one group board to CEFelipe Artur2018-03-0335-84/+440
* | | | | | | Merge branch '5029-support-cluster-metrics-ce' into 'master'Grzegorz Bizon2018-03-0611-110/+124
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-06474-6021/+4918
| |\ \ \ \ \ \
View Lorry Controller Status