Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'hotfix/ruby-21-broken-update' into 'master' | Marin Jankovski | 2016-01-29 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-... | James Lopez | 2016-01-28 | 25 | -29/+194 |
| |\ | |||||
| * | | trick rubocop and temporarily add ruby 2.1 images for any branch | James Lopez | 2016-01-28 | 2 | -2/+2 |
* | | | Merge branch 'mr-merge-base' into 'master' | Robert Speicher | 2016-01-28 | 5 | -21/+22 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into mr-merge-basemr-merge-base | Douwe Maan | 2016-01-28 | 21 | -36/+39 |
| |\ \ \ | |||||
| * | | | | Fix specs | Douwe Maan | 2016-01-28 | 3 | -3/+6 |
| * | | | | Correctly determine MR diff base when MR has merge conflicts | Douwe Maan | 2016-01-27 | 4 | -20/+18 |
* | | | | | Merge branch 'highlight-blame' into 'master' | Robert Speicher | 2016-01-28 | 2 | -29/+5 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into highlight-blame | Douwe Maan | 2016-01-28 | 21 | -36/+39 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 2 | -29/+3 |
| * | | | | | Fix highlighting in blame view. | Douwe Maan | 2016-01-27 | 2 | -4/+6 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs-ldap-user' into 'master' | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Backport LDAP user assignment changes from EE | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 13 | -18/+159 |
|\ \ \ \ | |||||
| * | | | | Align filter dropdown.issue_2406 | Rubén Dávila | 2016-01-27 | 1 | -0/+4 |
| * | | | | Remove no longer required CSS rule. | Rubén Dávila | 2016-01-20 | 1 | -4/+0 |
| * | | | | Refactor some CSS rules. | Rubén Dávila | 2016-01-20 | 2 | -6/+17 |
| * | | | | Some fixes from last code review. | Rubén Dávila | 2016-01-20 | 4 | -5/+5 |
| * | | | | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 3 | -19/+30 |
| * | | | | Add icon for private forks notice. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+16 |
| * | | | | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 2 | -4/+7 |
| * | | | | aligns menu at top on one row | Jacob Schatz | 2016-01-20 | 2 | -10/+26 |
| * | | | | changing projects css | Jacob Schatz | 2016-01-20 | 1 | -1/+0 |
| * | | | | WIP: Add sort dropdown. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+20 |
| * | | | | Little update to copy and custom content for empty results. #2406 | Rubén Dávila | 2016-01-20 | 1 | -8/+13 |
| * | | | | Show last commit as description. #2406 | Rubén Dávila | 2016-01-20 | 3 | -4/+10 |
| * | | | | Fix broken specs. #2406 | Rubén Dávila | 2016-01-20 | 1 | -4/+2 |
| * | | | | Add ability to filter by namespace. #2406 | Rubén Dávila | 2016-01-20 | 2 | -12/+20 |
| * | | | | Use adequate icon for Forks link on sidebar. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| * | | | | Show forks counter on listing. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+10 |
| * | | | | Add fork button and implement ability to distinguish between public and prote... | Rubén Dávila | 2016-01-20 | 2 | -2/+26 |
| * | | | | Use Project creator's avatar in fork listing. #2406 | Rubén Dávila | 2016-01-20 | 5 | -4/+12 |
| * | | | | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 8 | -9/+19 |
* | | | | | Merge branch 'issue_5546' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 2 | -2/+23 |
|\ \ \ \ \ | |||||
| * | | | | | Make default sorting preference work for Issues and MRs.issue_5546 | Rubén Dávila | 2016-01-22 | 1 | -4/+2 |
| * | | | | | Merge branch 'master' into issue_5546 | Rubén Dávila | 2016-01-22 | 93 | -468/+632 |
| |\ \ \ \ \ | |||||
| * | | | | | | Make sorting preference reusable for all projects. | Rubén Dávila | 2016-01-22 | 5 | -14/+15 |
| * | | | | | | Make cookie suffix more simpler. | Rubén Dávila | 2016-01-21 | 1 | -2/+2 |
| * | | | | | | Little refactor plus some specs. | Rubén Dávila | 2016-01-21 | 1 | -12/+6 |
| * | | | | | | Remember last sort option used. | Rubén Dávila | 2016-01-20 | 5 | -2/+30 |
* | | | | | | | Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' | Jacob Schatz | 2016-01-28 | 7 | -8/+7 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Removed sorted text from dropdowns | Phil Hughes | 2016-01-28 | 7 | -8/+7 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-off | Jacob Schatz | 2016-01-25 | 1 | -1/+1 |
* | | | | | | | Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 2 | -0/+4 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Adds comment about event listenerfeature/jschatz1/instant-issuable-history | Jacob Schatz | 2016-01-26 | 1 | -0/+1 |
| * | | | | | | Adds feature: Ajax Close/Open updates discussion automatically | Jacob Schatz | 2016-01-26 | 2 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'update-ruby-2.2.4' into 'master' | Douwe Maan | 2016-01-27 | 2 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 | James Lopez | 2016-01-27 | 40 | -153/+219 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | fix rubocop new 2.2 syntax issues | James Lopez | 2016-01-25 | 2 | -2/+2 |