summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Align all avatars and system notes in discussionalign-vertical-discussion-lineAnnabel Dunstone Gray2018-11-121-3/+3
|
* Merge branch 'sh-fix-refresh-service-deleted-branch' into 'master'Douwe Maan2018-11-121-1/+1
|\ | | | | | | | | | | | | Fix MergeRequestService erroring out on deleted branch Closes #53853 See merge request gitlab-org/gitlab-ce!22989
| * Fix MergeRequestService erroring out on deleted branchStan Hu2018-11-121-1/+1
| | | | | | | | | | | | | | | | When a branch is deleted, the push commit IDs is an empty array. The previous change would attempt to call `[].exists?`, which is invalid. Fix this by returning `MergeRequestDiffCommit.none` instead. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53853
* | 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 MRs (with feature-flag) Closes #13950 See merge request gitlab-org/gitlab-ce!22914
| * 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 path Closes #53781 See merge request gitlab-org/gitlab-ce!22978
| * | Changed diff tree filtering to pathPhil Hughes2018-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Previously it was using name which could make it hard to filter for the file you want in a certain folder. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53781
* | | Merge branch 'discussion-perf-improvement' into 'master'Filipa Lacerda2018-11-127-23/+30
|\ \ \ | | | | | | | | | | | | | | | | Improve initial rendering of discussion notes See merge request gitlab-org/gitlab-ce!22607
| * | | 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
| | | | | | | | | | | | | | | | Fixed duplicate TaskList requests being made
| * | | Improve initial rendering of discussion notesPhil Hughes2018-11-095-13/+21
| | | | | | | | | | | | | | | | | | | | | | | | This improves the initial rendering performance of notes by only creating a new TaskList for the whole app, rather than on a per-note component basis.
* | | | Merge branch 'blackst0ne-add-discord-service' into 'master'Sean McGivern2018-11-123-0/+59
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Add Discord integration Closes #21635 See merge request gitlab-org/gitlab-ce!22684
| * | | 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 'fix-error-handling-bugs-in-kubernetes-integration' into 'master'Dmitriy Zaporozhets2018-11-112-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix error handling bugs in kubernetes integration See merge request gitlab-org/gitlab-ce!22922
| * | | | Fix error handling in cluster_platform_configure_workerDylan Griffith2018-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have also extracted an issue in https://gitlab.com/gitlab-org/gitlab-ce/issues/53738 to surface these errors to users but now I am just fixing the bug where kubernetes_namespace is undefined while handling this error
| * | | | Remove special handling for 404 response from K8sDylan Griffith2018-11-091-2/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | There is no reason to specially handle 404 here. We only handle 404 specifically if we are fetching something and want to return `nil` if 404. This does not apply here.
* | | | 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-ui See merge request gitlab-org/gitlab-ce!22923
| * | | | Updates clipboard button with gitlab-ui51259-gitlab-ui-replacementFilipa Lacerda2018-11-091-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates clipboard button component to use the new glTooltipDirective and the new glButton component from gitlab-ui
* | | | | Merge branch '53768-diff-comment-action-btns' into 'master'Phil Hughes2018-11-092-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of diff comment buttons Closes #53768 See merge request gitlab-org/gitlab-ce!22944
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add revert to commits API Closes gitlab-org/release/framework#48 See merge request gitlab-org/gitlab-ce!22919
| * | | | | Correct error message returned by ChangeServiceRobert Speicher2018-11-081-2/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the string was spanning multiple lines and included a needless `\n` character in the resulting error message. This change also reduces duplication by assigning two variables.
* | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | User can create a group level cluster and install applications See merge request gitlab-org/gitlab-ce!22450
| * | | | | Still raise if there's no #actual_namespaceThong Kuah2018-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | However, we only need to raise for project_type clusters to maintain previous behaviour. In all probablity this requirement to have actual_namespace came from KubernetesService and will no longer be required soon.
| * | | | | Reverse view override as EE has an override tooThong Kuah2018-11-086-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | Use presenters instead otherwise we will have x2 overides in EE
| * | | | | Refactor to use presenterThong Kuah2018-11-087-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refacotr project or group specific `if` logic to be contained within each presenter instead. Also add :override to ensure super method exists.
| * | | | | Raise on unknown clusterableThong Kuah2018-11-081-0/+2
| | | | | |
| * | | | | Consolidate how we allow user defined namespaceThong Kuah2018-11-086-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use model method as single source of truth instead of splitting between presenter and Kubernetes model
| * | | | | Remove methods already provided by presentersThong Kuah2018-11-081-8/+0
| | | | | |
| * | | | | Resolve rubocop warningsMike Greiling2018-11-082-2/+1
| | | | | |
| * | | | | Remove "active" badge from cluster index for nowMike Greiling2018-11-081-3/+1
| | | | | |
| * | | | | Rename is_project? to project?Mike Greiling2018-11-085-5/+5
| | | | | |
| * | | | | Update copy above new cluster formMike Greiling2018-11-081-5/+9
| | | | | |
| * | | | | Update empty state for group clusters indexMike Greiling2018-11-084-1/+19
| | | | | |
| * | | | | Only project clusters has Project Namespace fieldThong Kuah2018-11-087-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group clusters should not allow Project Namespace so don't show that field input too
| * | | | | Adds feature flag for Group ClustersMayra Cabrera2018-11-082-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the frontend is still in progress and other related backend is still in prgress we need a feature flag to turn off Group Clusters.
| * | | | | Add active and connection disabled badges to clustersMike Greiling2018-11-081-0/+4
| | | | | |
| * | | | | Fix vertical padding between clusters in index pageMike Greiling2018-11-081-0/+4
| | | | | |
| * | | | | Redesign cluster indexMike Greiling2018-11-083-14/+40
| | | | | |
| * | | | | Remove integration toggle from cluster index pageMike Greiling2018-11-084-40/+8
| | | | | |
| * | | | | Define cluster types in a constant within frontendMike Greiling2018-11-082-3/+10
| | | | | |
| * | | | | Remove "project namespace" from cluster index pageMike Greiling2018-11-082-7/+2
| | | | | |