Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge branch 'avatar-cropping' into 'master' "revert-avatar-cropping | Rémy Coutable | 2016-03-15 | 1 | -14/+6 |
* | Merge branch 'fix-commit-status-rendering' into 'master' | Robert Speicher | 2016-03-15 | 1 | -1/+1 |
|\ | |||||
| * | Cleanup CiCommit and CiBuild | Kamil Trzcinski | 2016-03-14 | 1 | -1/+1 |
* | | Merge branch 'improve-award-emoji-spec' into 'master' | Douwe Maan | 2016-03-14 | 1 | -4/+1 |
|\ \ | |||||
| * | | Improve award emoji test reliability and eliminate sleepsimprove-award-emoji-spec | Stan Hu | 2016-03-13 | 1 | -4/+1 |
* | | | Merge branch 'share-project-ce' into 'master' | Dmitriy Zaporozhets | 2016-03-14 | 6 | -0/+114 |
|\ \ \ | |||||
| * | | | Bring shared project feature tests from EE | Dmitriy Zaporozhets | 2016-03-12 | 4 | -0/+48 |
| * | | | Add finders logic and tests for shared projects feature | Dmitriy Zaporozhets | 2016-03-11 | 2 | -0/+66 |
* | | | | Merge branch 'issue-filter-tests' into 'master' | Robert Speicher | 2016-03-14 | 2 | -18/+10 |
|\ \ \ \ | |||||
| * | | | | Fixed tests for MR & issue filtersissue-filter-tests | Phil Hughes | 2016-03-14 | 2 | -18/+10 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'remove-sleeps-from-network-graph-spec' into 'master' | Robert Speicher | 2016-03-14 | 2 | -5/+7 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove sleeps from network graph feature spec | Stan Hu | 2016-03-13 | 2 | -5/+7 |
| | |/ | |/| | |||||
* | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" ...improve-issues-filter-all-spec | Stan Hu | 2016-03-13 | 1 | -8/+5 |
|/ / | |||||
* | | Merge branch 'group-activity-separate-tab' into 'master' | Robert Speicher | 2016-03-11 | 2 | -0/+8 |
|\ \ | |||||
| * | | Move group activity feed to separate page for consistency with dashboard and ... | Dmitriy Zaporozhets | 2016-03-10 | 2 | -0/+8 |
* | | | Merge branch 'award-emoji-design-update' into 'master' | Jacob Schatz | 2016-03-11 | 1 | -13/+13 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Updated award emoji tests | Phil Hughes | 2016-03-11 | 1 | -13/+13 |
* | | | Merge branch 'account-settings' into 'master' | Jacob Schatz | 2016-03-11 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Fixed failing tests | Phil Hughes | 2016-03-11 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'comment-discard-button' into 'master' | Jacob Schatz | 2016-03-11 | 7 | -12/+12 |
|\ \ \ | |||||
| * | | | Updated tests | Phil Hughes | 2016-03-04 | 6 | -10/+10 |
| * | | | Fixed failing comment test | Phil Hughes | 2016-03-04 | 1 | -1/+1 |
| * | | | Fixed tests for comment forms | Phil Hughes | 2016-03-04 | 1 | -1/+1 |
* | | | | Merge branch 'comment-error' into 'master' | Dmitriy Zaporozhets | 2016-03-11 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Change test in an attempt to pass.comment-error | Jacob Schatz | 2016-03-10 | 1 | -1/+1 |
* | | | | web hooks to webhooks | ashleys | 2016-03-10 | 2 | -4/+4 |
|/ / / | |||||
* | | | Fixed failing tests | Phil Hughes | 2016-03-10 | 4 | -14/+36 |
| |/ |/| | |||||
* | | Retry spinach tests | Kamil Trzcinski | 2016-03-09 | 2 | -0/+15 |
* | | Merge branch 'improve-archived-projects' | Dmitriy Zaporozhets | 2016-03-09 | 3 | -1/+10 |
|\ \ | |||||
| * | | Fix test | Dmitriy Zaporozhets | 2016-03-04 | 1 | -1/+1 |
| * | | Add test for archive toggle feature | Dmitriy Zaporozhets | 2016-03-04 | 2 | -0/+9 |
* | | | Remove redundant integration tests | Robert Speicher | 2016-03-07 | 5 | -46/+0 |
* | | | Merge branch 'issue_13621_2' into 'master' | Douwe Maan | 2016-03-07 | 3 | -3/+63 |
|\ \ \ | |||||
| * | | | Updates from last code review.issue_13621_2 | Rubén Dávila | 2016-03-06 | 3 | -10/+1 |
| * | | | Add some spinach specs. | Rubén Dávila | 2016-03-04 | 2 | -2/+71 |
| |/ / | |||||
* | | | Merge branch 'rs-factory-nitpicks' into 'master' | Douwe Maan | 2016-03-07 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | Add traits for each access_level to ProjectMember factory | Robert Speicher | 2016-03-06 | 2 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'indicate-mr-diverged-from-target' into 'master' | Douwe Maan | 2016-03-07 | 3 | -5/+53 |
|\ \ \ | |/ / |/| | | |||||
| * | | Indicate how much an MR branch diverges from the target branch | Pierre de La Morinerie | 2016-03-03 | 3 | -1/+46 |
| * | | Tests: extract a merge_request_path helper | Pierre de La Morinerie | 2016-03-03 | 1 | -4/+7 |
* | | | Invalidate cache for builds badge | Grzegorz Bizon | 2016-03-04 | 2 | -0/+9 |
| |/ |/| | |||||
* | | Fixed failing ssh key tests | Phil Hughes | 2016-03-03 | 2 | -3/+3 |
* | | Merge branch 'password-settings' into 'master' | Jacob Schatz | 2016-03-03 | 1 | -3/+3 |
|\ \ | |||||
| * | | Fixed failing password tests | Phil Hughes | 2016-03-02 | 1 | -3/+3 |
* | | | Use Gitlab::Git::DiffCollections | Jacob Vosmaer | 2016-03-03 | 1 | -2/+5 |
| |/ |/| | |||||
* | | Merge branch 'issue_4095' into 'master' | Dmitriy Zaporozhets | 2016-03-03 | 2 | -1/+40 |
|\ \ | |||||
| * | | Don't list merge requests from archived projects in Group view. | Rubén Dávila | 2016-03-02 | 2 | -0/+20 |
| * | | Don't list issues from archived projects in Group view. | Rubén Dávila | 2016-03-02 | 2 | -1/+20 |
* | | | Merge branch 'improve-user-tabs' into 'master' | Jacob Schatz | 2016-03-03 | 2 | -0/+29 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix specs | Alfredo Sumaran | 2016-03-01 | 1 | -0/+7 |