summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch ↵Sean McGivern2019-02-0417-62/+309
|\ | | | | | | | | | | | | '19745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneously' into 'master' Forms with task lists can be overwritten when editing simultaneously See merge request gitlab-org/gitlab-ce!23938
| * lockVersion should be required false and default 019745-forms-with-task-lists-can-be-overwritten-when-editing-simultaneouslyFatih Acet2019-02-011-1/+2
| |
| * Address review commentsBrett Walker2019-01-312-18/+19
| |
| * Stop closing issue edit form in error stateFatih Acet2019-01-301-2/+0
| |
| * Changes for review commentsBrett Walker2019-01-302-24/+29
| |
| * Use the sourcepos attribute for finding tasksBrett Walker2019-01-303-8/+19
| |
| * Address review comments and fix commented specFatih Acet2019-01-303-21/+21
| |
| * Some cleanup and improvements on frontent logicFatih Acet2019-01-302-6/+8
| |
| * Add missing specs.Fatih Acet2019-01-302-7/+10
| |
| * Add new spec for updateStoreState methodFatih Acet2019-01-301-7/+3
| |
| * Specs for Issue::UpdateServiceBrett Walker2019-01-302-10/+23
| |
| * Add back call to execute_hooksBrett Walker2019-01-302-20/+19
| |
| * Raise exception if we can't match the update_taskBrett Walker2019-01-302-26/+32
| | | | | | | | and some additional refactoring
| * Send lockVersion from MR description task listFatih Acet2019-01-304-6/+4
| |
| * Refactor and added specsBrett Walker2019-01-303-46/+68
| |
| * Toggle individual task list group while requestingFatih Acet2019-01-301-10/+17
| |
| * Specs for caching and issue controller changesBrett Walker2019-01-301-3/+1
| |
| * Ignore lock_version for task updatesBrett Walker2019-01-301-0/+5
| |
| * Refactor toggling of task list itemBrett Walker2019-01-304-59/+96
| |
| * Fix failing specs and lint errors.Fatih Acet2019-01-303-12/+23
| |
| * Added 'handle_update_task' for new task handlingBrett Walker2019-01-303-3/+64
| |
| * Don't consider field invalid if updating html alsoBrett Walker2019-01-301-1/+3
| |
| * Pass down the index of the checkbox checkedBrett Walker2019-01-301-2/+3
| |
| * Pass down the new state of the checkboxBrett Walker2019-01-302-2/+3
| | | | | | | | and whitelist the `update_task` parameter
| * Pass line number and source to backendFatih Acet2019-01-301-0/+6
| |
| * Handle tasklist update failed in app componentFatih Acet2019-01-302-2/+13
| |
| * Disable tasklist items while request is being doneFatih Acet2019-01-301-2/+18
| |
| * Update lock version after requestFatih Acet2019-01-301-1/+4
| |
| * Fix data coming down to error handler of tasklistFatih Acet2019-01-302-3/+4
| |
| * Pass tasklist lock versionBrett Walker2019-01-304-2/+18
| | | | | | | | receive data on when there is a conflict
| * Show error message from backendFatih Acet2019-01-301-1/+7
| |
| * Accept lockVersion as a prop and add to storeFatih Acet2019-01-302-0/+8
| |
| * Add lock version to issuable helpersFatih Acet2019-01-302-1/+3
| |
* | Merge branch '55098-ui-bug-adding-group-members-with-lower-permissions' into ↵Sean McGivern2019-02-041-2/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "UI bug adding group members with lower permissions" Closes #55098 See merge request gitlab-org/gitlab-ce!24820
| * | Update members service to cope with errorsJames Lopez2019-02-011-2/+12
| | |
* | | Merge branch ↵Nick Thomas2019-02-011-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57063-implement-new-arguments-iid-for-issuesresolver-in-graphql' into 'master' Resolve "Implement new arguments `iid` for `IssuesResolver` in GraphQL" Closes #57063 See merge request gitlab-org/gitlab-ce!24802
| * | | Add argument iids to IssuesResolverLin Jen-Shin2019-02-011-0/+4
| |/ /
* | | Merge branch 'auto-devops-better-build-debugging' into 'master'Dan Davison2019-02-012-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Wait for auto-devops CI jobs on the job page See merge request gitlab-org/gitlab-ce!24839
| * | | Wait for auto-devops CI jobs on the job pageJames Fargher2019-02-012-2/+4
| | | | | | | | | | | | | | | | | | | | These tests used to wait on the pipeline page which made debugging job failures difficult
* | | | Merge branch 'ce-reduce-diff-in-groups-create_service' into 'master'dastor-update-AWS-instructionsDouglas Barbosa Alexandre2019-02-011-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in Groups::CreateService See merge request gitlab-org/gitlab-ce!24871
| * | | | Reduce diff with EE in Groups::CreateServiceRémy Coutable2019-02-011-0/+6
| | |/ / | |/| | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'ee-1979-blobs-at' into 'master'Douwe Maan2019-02-011-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix migration when project repository is missing See merge request gitlab-org/gitlab-ce!24859
| * | | | Fix migration when project repository is missingMark Chao2019-02-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The data migration looks for code owner file and errs if repository is missing.
* | | | | Merge branch 'ce-reduce-diff-in-pipeline_trigger_service' into 'master'Douglas Barbosa Alexandre2019-02-011-0/+10
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Reduce diff with EE in Ci::PipelineTriggerService See merge request gitlab-org/gitlab-ce!24866
| * | | | Reduce diff with EE in Ci::PipelineTriggerServiceRémy Coutable2019-02-011-0/+10
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | adding a spec for issues/310Mesut Güneş2019-02-013-4/+4
|/ / /
* | | Fix cluster installation processing spinner (reopened)Jacques Erasmus2019-02-013-48/+42
| | |
* | | Merge branch 'winh-position-helpers' into 'master'Clement Ho2019-02-011-0/+6
|\ \ \ | | | | | | | | | | | | | | | | Add CSS helper classes for positioning See merge request gitlab-org/gitlab-ce!24821
| * | | Add CSS helper classes for positioningWinnie Hellmann2019-01-311-0/+6
| | | |
* | | | Merge branch 'qa-github-oauth-login-test-2' into 'master'Rémy Coutable2019-02-012-1/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add e2e QA test for logging in using Github OAuth See merge request gitlab-org/gitlab-ce!24817