summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* CleanupAmit Rathi2018-11-135-32/+10
* Cert manager migration, cluster_issuer etc.Amit Rathi2018-11-132-0/+76
* Merge branch 'master' into certmanager-tempAmit Rathi2018-11-1341-235/+425
|\
| * Fix deployment jobs using nil tokenThong Kuah2018-11-132-1/+3
| * Fix help text in Admin Area > Background JobsMax Vogler2018-11-131-1/+4
| * Merge branch '53888-missing-favicon' into 'master'Phil Hughes2018-11-131-2/+2
| |\
| | * Adds back missing CI favicon53888-missing-faviconFilipa Lacerda2018-11-121-2/+2
| * | Merge branch 'align-vertical-discussion-line' into 'master'Fatih Acet2018-11-121-3/+3
| |\ \ | | |/ | |/|
| | * Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
| * | Merge branch 'ce-3777-promote-to-epic' into 'master'Rémy Coutable2018-11-125-131/+219
| |\ \
| | * | Extract code from Issues::MoveServicece-3777-promote-to-epicJarka Košanová2018-11-125-131/+219
| * | | Merge branch 'fix-tags-for-envs' into 'master'Stan Hu2018-11-121-5/+2
| |\ \ \
| | * | | Fix non-hacking wayKamil Trzciński2018-11-121-2/+1
| | * | | Do not reload self on hooks when creating deploymentfix-tags-for-envsKamil Trzciński2018-11-121-3/+1
| * | | | Merge branch 'sh-53180-append-path' into 'master'Rémy Coutable2018-11-127-32/+28
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Make sure there's only one slash as path separatorsh-53180-append-pathStan Hu2018-11-097-32/+28
| * | | | Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-121-1/+1
| |\ \ \ \
| | * | | | Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-121-1/+1
| * | | | | Removes feature flag for ciEnvironmentsStatusChangesFilipa Lacerda2018-11-123-10/+2
| |/ / / /
| * | | | Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'Douwe Maan2018-11-128-25/+71
| |\ \ \ \
| | * | | | Comment on any expanded diff line on MRsosw-comment-on-any-line-on-diffs-w-feature-flagOswaldo Ferreira2018-11-098-25/+71
| * | | | | Merge branch 'mr-tree-filter-path-name' into 'master'Filipa Lacerda2018-11-121-1/+1
| |\ \ \ \ \
| | * | | | | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-127-23/+30
| |\ \ \ \ \
| | * | | | | Consistently use Vue.nexTick when starting taskListdiscussion-perf-improvementPhil Hughes2018-11-091-8/+11
| | * | | | | Init task list when creating new note & discussionPhil Hughes2018-11-092-0/+2
| | * | | | | Fix TaskList init on update & pollPhil Hughes2018-11-092-11/+5
| | * | | | | Improve initial rendering of discussion notesPhil Hughes2018-11-095-13/+21
| * | | | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-123-0/+59
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix minor offensesblackst0ne-add-discord-serviceblackst0ne2018-11-101-5/+1
| | * | | | | DRY specs, fix typos in docsblackst0ne2018-11-061-1/+1
| | * | | | | Update discord notification serviceblackst0ne2018-11-051-6/+4
| | * | | | | Add Discord integrationblackst0ne2018-10-303-0/+65
* | | | | | | Merge branch 'master' into certmanager-tempAmit Rathi2018-11-12478-3745/+6920
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-112-3/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Fix error handling in cluster_platform_configure_workerDylan Griffith2018-11-091-1/+1
| | * | | | | Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
| | | |/ / / | | |/| | |
| * | | | | Use gitlab-ui in jobs and pipelinesFilipa Lacerda2018-11-097-68/+91
| * | | | | Resolve "GitLab Pages settings regressions"Scott Hampton2018-11-093-13/+12
| * | | | | Merge branch '51259-gitlab-ui-replacement' into 'master'Clement Ho2018-11-091-12/+6
| |\ \ \ \ \
| | * | | | | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-091-12/+6
| * | | | | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
| |\ \ \ \ \ \
| | * | | | | | Fix alignment of diff comment buttons53768-diff-comment-action-btnsAnnabel Dunstone Gray2018-11-092-4/+3
| | |/ / / / /
| * | | | | | Merge branch 'rs-revert-api' into 'master'Nick Thomas2018-11-091-2/+6
| |\ \ \ \ \ \
| | * | | | | | Correct error message returned by ChangeServiceRobert Speicher2018-11-081-2/+6
| | |/ / / / /
| * | | | | | Improve Debugging Capabilities For Helm Application InstallsDylan Griffith2018-11-091-1/+1
| * | | | | | Merge branch '34758-group-cluster-controller' into 'master'Kamil Trzciński2018-11-0936-89/+306
| |\ \ \ \ \ \
| | * | | | | | Still raise if there's no #actual_namespaceThong Kuah2018-11-081-0/+1
| | * | | | | | Reverse view override as EE has an override tooThong Kuah2018-11-086-14/+20
| | * | | | | | Refactor to use presenterThong Kuah2018-11-087-23/+44