Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch ↵ | Sean McGivern | 2019-02-04 | 17 | -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-simultaneously | Fatih Acet | 2019-02-01 | 1 | -1/+2 |
| | | |||||
| * | Address review comments | Brett Walker | 2019-01-31 | 2 | -18/+19 |
| | | |||||
| * | Stop closing issue edit form in error state | Fatih Acet | 2019-01-30 | 1 | -2/+0 |
| | | |||||
| * | Changes for review comments | Brett Walker | 2019-01-30 | 2 | -24/+29 |
| | | |||||
| * | Use the sourcepos attribute for finding tasks | Brett Walker | 2019-01-30 | 3 | -8/+19 |
| | | |||||
| * | Address review comments and fix commented spec | Fatih Acet | 2019-01-30 | 3 | -21/+21 |
| | | |||||
| * | Some cleanup and improvements on frontent logic | Fatih Acet | 2019-01-30 | 2 | -6/+8 |
| | | |||||
| * | Add missing specs. | Fatih Acet | 2019-01-30 | 2 | -7/+10 |
| | | |||||
| * | Add new spec for updateStoreState method | Fatih Acet | 2019-01-30 | 1 | -7/+3 |
| | | |||||
| * | Specs for Issue::UpdateService | Brett Walker | 2019-01-30 | 2 | -10/+23 |
| | | |||||
| * | Add back call to execute_hooks | Brett Walker | 2019-01-30 | 2 | -20/+19 |
| | | |||||
| * | Raise exception if we can't match the update_task | Brett Walker | 2019-01-30 | 2 | -26/+32 |
| | | | | | | | | and some additional refactoring | ||||
| * | Send lockVersion from MR description task list | Fatih Acet | 2019-01-30 | 4 | -6/+4 |
| | | |||||
| * | Refactor and added specs | Brett Walker | 2019-01-30 | 3 | -46/+68 |
| | | |||||
| * | Toggle individual task list group while requesting | Fatih Acet | 2019-01-30 | 1 | -10/+17 |
| | | |||||
| * | Specs for caching and issue controller changes | Brett Walker | 2019-01-30 | 1 | -3/+1 |
| | | |||||
| * | Ignore lock_version for task updates | Brett Walker | 2019-01-30 | 1 | -0/+5 |
| | | |||||
| * | Refactor toggling of task list item | Brett Walker | 2019-01-30 | 4 | -59/+96 |
| | | |||||
| * | Fix failing specs and lint errors. | Fatih Acet | 2019-01-30 | 3 | -12/+23 |
| | | |||||
| * | Added 'handle_update_task' for new task handling | Brett Walker | 2019-01-30 | 3 | -3/+64 |
| | | |||||
| * | Don't consider field invalid if updating html also | Brett Walker | 2019-01-30 | 1 | -1/+3 |
| | | |||||
| * | Pass down the index of the checkbox checked | Brett Walker | 2019-01-30 | 1 | -2/+3 |
| | | |||||
| * | Pass down the new state of the checkbox | Brett Walker | 2019-01-30 | 2 | -2/+3 |
| | | | | | | | | and whitelist the `update_task` parameter | ||||
| * | Pass line number and source to backend | Fatih Acet | 2019-01-30 | 1 | -0/+6 |
| | | |||||
| * | Handle tasklist update failed in app component | Fatih Acet | 2019-01-30 | 2 | -2/+13 |
| | | |||||
| * | Disable tasklist items while request is being done | Fatih Acet | 2019-01-30 | 1 | -2/+18 |
| | | |||||
| * | Update lock version after request | Fatih Acet | 2019-01-30 | 1 | -1/+4 |
| | | |||||
| * | Fix data coming down to error handler of tasklist | Fatih Acet | 2019-01-30 | 2 | -3/+4 |
| | | |||||
| * | Pass tasklist lock version | Brett Walker | 2019-01-30 | 4 | -2/+18 |
| | | | | | | | | receive data on when there is a conflict | ||||
| * | Show error message from backend | Fatih Acet | 2019-01-30 | 1 | -1/+7 |
| | | |||||
| * | Accept lockVersion as a prop and add to store | Fatih Acet | 2019-01-30 | 2 | -0/+8 |
| | | |||||
| * | Add lock version to issuable helpers | Fatih Acet | 2019-01-30 | 2 | -1/+3 |
| | | |||||
* | | Merge branch '55098-ui-bug-adding-group-members-with-lower-permissions' into ↵ | Sean McGivern | 2019-02-04 | 1 | -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 errors | James Lopez | 2019-02-01 | 1 | -2/+12 |
| | | | |||||
* | | | Merge branch ↵ | Nick Thomas | 2019-02-01 | 1 | -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 IssuesResolver | Lin Jen-Shin | 2019-02-01 | 1 | -0/+4 |
| |/ / | |||||
* | | | Merge branch 'auto-devops-better-build-debugging' into 'master' | Dan Davison | 2019-02-01 | 2 | -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 page | James Fargher | 2019-02-01 | 2 | -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-instructions | Douglas Barbosa Alexandre | 2019-02-01 | 1 | -0/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Reduce diff with EE in Groups::CreateService See merge request gitlab-org/gitlab-ce!24871 | ||||
| * | | | | Reduce diff with EE in Groups::CreateService | Rémy Coutable | 2019-02-01 | 1 | -0/+6 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'ee-1979-blobs-at' into 'master' | Douwe Maan | 2019-02-01 | 1 | -0/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix migration when project repository is missing See merge request gitlab-org/gitlab-ce!24859 | ||||
| * | | | | Fix migration when project repository is missing | Mark Chao | 2019-02-01 | 1 | -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 Alexandre | 2019-02-01 | 1 | -0/+10 |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | Reduce diff with EE in Ci::PipelineTriggerService See merge request gitlab-org/gitlab-ce!24866 | ||||
| * | | | | Reduce diff with EE in Ci::PipelineTriggerService | Rémy Coutable | 2019-02-01 | 1 | -0/+10 |
| |/ / / | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | adding a spec for issues/310 | Mesut Güneş | 2019-02-01 | 3 | -4/+4 |
|/ / / | |||||
* | | | Fix cluster installation processing spinner (reopened) | Jacques Erasmus | 2019-02-01 | 3 | -48/+42 |
| | | | |||||
* | | | Merge branch 'winh-position-helpers' into 'master' | Clement Ho | 2019-02-01 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | Add CSS helper classes for positioning See merge request gitlab-org/gitlab-ce!24821 | ||||
| * | | | Add CSS helper classes for positioning | Winnie Hellmann | 2019-01-31 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge branch 'qa-github-oauth-login-test-2' into 'master' | Rémy Coutable | 2019-02-01 | 2 | -1/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add e2e QA test for logging in using Github OAuth See merge request gitlab-org/gitlab-ce!24817 |