Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-todos-feature-spec' into 'master' | Robert Speicher | 2016-04-22 | 1 | -18/+20 |
|\ | |||||
| * | Refactor Todos feature spec to be faster and less brittle | Robert Speicher | 2016-04-22 | 1 | -18/+20 |
* | | Merge branch '15513-fix-undefined-can-method' into 'master' | Robert Speicher | 2016-04-22 | 1 | -0/+20 |
|\ \ | |/ |/| | |||||
| * | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-method | Rémy Coutable | 2016-04-22 | 1 | -0/+20 |
* | | Merge branch 'fix/cherry-pick-specs-location' into 'master' | Robert Speicher | 2016-04-22 | 1 | -0/+0 |
|\ \ | |||||
| * | | Move cherry-pick feature specs to proper directoryfix/cherry-pick-specs-location | Grzegorz Bizon | 2016-04-22 | 1 | -0/+0 |
| |/ | |||||
* | | Merge branch 'issue_3799' into 'master' | Rémy Coutable | 2016-04-22 | 2 | -30/+27 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into issue_3799 | Alfredo Sumaran | 2016-04-22 | 10 | -33/+116 |
| |\ \ | | |/ | |||||
| * | | Add tests for filtering owned projectsissue_3799 | Alfredo Sumaran | 2016-04-22 | 2 | -30/+27 |
* | | | Fixed issue with assignee object not being returned | Phil Hughes | 2016-04-22 | 1 | -0/+21 |
| |/ |/| | |||||
* | | Merge branch 'issue_3799' into 'master' | Rémy Coutable | 2016-04-22 | 1 | -0/+30 |
|\ \ | |/ | |||||
| * | Merge remote-tracking branch 'origin/master' into issue_3799 | Alfredo Sumaran | 2016-04-21 | 62 | -278/+1950 |
| |\ | |||||
| * | | Add tests | Alfredo Sumaran | 2016-04-18 | 1 | -0/+30 |
* | | | Merge branch 'confirmation-screen' into 'master' | Robert Speicher | 2016-04-22 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Improved confirmation UXconfirmation-screen | Phil Hughes | 2016-04-21 | 1 | -2/+2 |
* | | | | Merge branch 'rs-diff_view' into 'master' | Rémy Coutable | 2016-04-22 | 2 | -8/+20 |
|\ \ \ \ | |||||
| * | | | | Clarify that the diff view setting always comes from the cookiers-diff_view | Robert Speicher | 2016-04-19 | 1 | -8/+0 |
| * | | | | Always read diff_view setting from the cookie | Robert Speicher | 2016-04-14 | 1 | -0/+20 |
* | | | | | Use association search in issuable create service | Grzegorz Bizon | 2016-04-22 | 1 | -6/+6 |
* | | | | | Add affinity checks in issue create service | Grzegorz Bizon | 2016-04-22 | 1 | -2/+9 |
* | | | | | Update specs to accomodate issuable assign changes | Grzegorz Bizon | 2016-04-22 | 4 | -21/+31 |
* | | | | | Verify label affiliation before assigning to issue | Grzegorz Bizon | 2016-04-22 | 1 | -0/+28 |
| |/ / / |/| | | | |||||
* | | | | Merge branch '15465-fix-sort-by-due-date' into 'master' | Yorick Peterse | 2016-04-21 | 1 | -0/+13 |
|\ \ \ \ | |||||
| * | | | | Remove the `.distinct` when finding issues15465-fix-sort-by-due-date | Rémy Coutable | 2016-04-21 | 1 | -0/+13 |
* | | | | | Merge branch 'dev_issue_15331' into 'master' | Robert Speicher | 2016-04-21 | 2 | -2/+15 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix failing spec | Alfredo Sumaran | 2016-04-21 | 2 | -2/+15 |
* | | | | | Merge branch 'label-dropdown-fix' into 'master' | Jacob Schatz | 2016-04-21 | 1 | -0/+79 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 6 | -7/+318 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 52 | -129/+1662 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add tests to check if a new label is added | Alfredo Sumaran | 2016-04-15 | 1 | -0/+79 |
* | | | | | | | Merge branch 'fix/label-filters' into 'master' | Douwe Maan | 2016-04-21 | 2 | -28/+53 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | refactored specs based on feedbackfix/label-filters | James Lopez | 2016-04-21 | 2 | -31/+18 |
| * | | | | | | | use wait_for_ajax instead of sleeping for 2 days! | James Lopez | 2016-04-21 | 1 | -10/+12 |
| * | | | | | | | refactored specs, adding more scenarios | James Lopez | 2016-04-21 | 2 | -22/+34 |
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters | James Lopez | 2016-04-21 | 37 | -59/+1223 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | final line missing | James Lopez | 2016-04-20 | 1 | -1/+1 |
| * | | | | | | | fix rubocop warning | James Lopez | 2016-04-20 | 1 | -2/+2 |
| * | | | | | | | udpated a few things based on MR feedback. Also added model spec | James Lopez | 2016-04-20 | 2 | -171/+192 |
| * | | | | | | | filter labels by including all filter titles as part of the query | James Lopez | 2016-04-19 | 1 | -0/+170 |
* | | | | | | | | Merge branch 'issue_5838' into 'master' | Rémy Coutable | 2016-04-21 | 4 | -14/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add changelog entry and fix convention in a specissue_5838 | Felipe Artur | 2016-04-20 | 1 | -1/+1 |
| * | | | | | | | | Projects members tab should follow visibility levels | Felipe Artur | 2016-04-18 | 4 | -27/+16 |
| * | | | | | | | | Show project members only for members | Felipe Artur | 2016-04-18 | 1 | -0/+27 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix/cross-project-labels-project-reference' into 'master' | Grzegorz Bizon | 2016-04-21 | 1 | -16/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix cross-project label ref with invalid project | Grzegorz Bizon | 2016-04-21 | 1 | -16/+26 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ci-commit-as-pipeline' into 'master' | Kamil Trzciński | 2016-04-21 | 14 | -164/+222 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-commit-as-pipelineci-commit-as-pipeline | Kamil Trzcinski | 2016-04-19 | 25 | -92/+750 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix rubocop | Kamil Trzcinski | 2016-04-18 | 1 | -1/+1 |
| * | | | | | | | | Fix tests | Kamil Trzcinski | 2016-04-18 | 2 | -25/+26 |
| * | | | | | | | | Make some logic less twistable | Kamil Trzcinski | 2016-04-17 | 1 | -1/+1 |