Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '18819-wiki-link-filter-exception' into 'master' 18824-improve-list-of-repositories-during-import-from-github | Stan Hu | 2016-06-18 | 2 | -1/+27 |
|\ | |||||
| * | Fix bug in `WikiLinkFilter`.18819-wiki-link-filter-exception | Timothy Andrew | 2016-06-18 | 2 | -1/+27 |
* | | Merge branch 'ci-scala-example' into 'master' | Achilleas Pipinellis | 2016-06-18 | 2 | -1/+49 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'master' into ci-scala-example | Achilleas Pipinellis | 2016-06-18 | 2714 | -22458/+103393 |
| |\ | |/ |/| | |||||
* | | Merge branch 'issue_12758' into 'master' | Douwe Maan | 2016-06-17 | 34 | -249/+643 |
|\ \ | |||||
| * | | Small frontend code fixes and restore 8a2d88f commit | Felipe Artur | 2016-06-17 | 2 | -7/+11 |
| * | | Merge master into issue_12758issue_12758 | Felipe Artur | 2016-06-17 | 208 | -1565/+11605 |
| |\ \ | |||||
| * | | | Allow users to set custom notifications in projects they don't own and severa... | Felipe Artur | 2016-06-17 | 12 | -59/+24 |
| * | | | Fixed bug with label clicking in modal not working | Phil Hughes | 2016-06-17 | 1 | -4/+3 |
| * | | | Fixed bug with clicking custom again not opening modal | Phil Hughes | 2016-06-17 | 2 | -1/+4 |
| * | | | Description for custom in dropdown | Phil Hughes | 2016-06-17 | 1 | -5/+5 |
| * | | | Fixed alignment of notification dropdown menu | Phil Hughes | 2016-06-17 | 3 | -4/+6 |
| * | | | Re-use notifications dropdown/modal for user profile | Felipe Artur | 2016-06-17 | 27 | -263/+418 |
| |\ \ \ | |||||
| | * | | | Re-use notifications dropdown on user profile | Felipe Artur | 2016-06-16 | 25 | -264/+361 |
| | * | | | Update migration to match current schema version | Felipe Artur | 2016-06-14 | 1 | -0/+0 |
| | * | | | Refactor custom notifications controller code and add specs | Felipe Artur | 2016-06-14 | 7 | -20/+65 |
| | * | | | Remove schema from branch history | Felipe Artur | 2016-06-13 | 11 | -39/+170 |
| | * | | | Add notification settings documentation and update screenshot | Felipe Artur | 2016-06-13 | 3 | -2/+5 |
| | * | | | Expose notification setting events in API | Felipe Artur | 2016-06-13 | 2 | -6/+26 |
| | * | | | Improve notification settings event keys and add some specs | Felipe Artur | 2016-06-13 | 3 | -50/+102 |
| | * | | | Implement custom notification level options | Felipe Artur | 2016-06-13 | 3 | -23/+69 |
| * | | | | Added description to custom option in notification dropdown | Phil Hughes | 2016-06-16 | 2 | -6/+8 |
| * | | | | Implement custom notification level options | Felipe Artur | 2016-06-15 | 18 | -78/+354 |
* | | | | | Merge branch 'fix-18717' into 'master' | Douwe Maan | 2016-06-17 | 6 | -11/+137 |
|\ \ \ \ \ | |||||
| * | | | | | Address Douwe's feedbackfix-18717 | Rémy Coutable | 2016-06-17 | 4 | -20/+53 |
| * | | | | | Ensure group/project owners can see their members' access_level | Rémy Coutable | 2016-06-17 | 3 | -2/+55 |
| * | | | | | Group owner cannot request access to a project of their group | Rémy Coutable | 2016-06-17 | 3 | -9/+49 |
* | | | | | | Merge branch 'issuable-todo-improvements' | Douwe Maan | 2016-06-18 | 8 | -28/+144 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Removed update methodissuable-todo-improvements | Phil Hughes | 2016-06-17 | 4 | -89/+83 |
| * | | | | | | Removed ID from button as frontend doesnt use anymore | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
| * | | | | | | Removed todo from JSON response | Phil Hughes | 2016-06-17 | 1 | -1/+0 |
| * | | | | | | Added todo controller tests for merge requests | Phil Hughes | 2016-06-17 | 1 | -37/+90 |
| * | | | | | | Checks for current_user when getting todo | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
| * | | | | | | Correctly checks if user is logged in when adding todo | Phil Hughes | 2016-06-17 | 2 | -1/+14 |
| * | | | | | | Improved manual todos | Phil Hughes | 2016-06-17 | 8 | -28/+85 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'gh-webhooks' into 'master' | Robert Speicher | 2016-06-17 | 2 | -6/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Warn about admin privilege to disable GitHub Webhooks | Douglas Barbosa Alexandre | 2016-06-17 | 1 | -1/+1 |
| * | | | | | | Listing GH Webhooks doesn't stop import process for non GH admin users | Douglas Barbosa Alexandre | 2016-06-17 | 1 | -5/+18 |
* | | | | | | | Merge branch 'api-endpoints-award-emoji' into 'master' | Robert Speicher | 2016-06-17 | 8 | -30/+722 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | fixup! updated docs for api endpoint award emoji | Z.J. van de Weg | 2016-06-17 | 3 | -24/+188 |
| * | | | | | | Add endpoints for award emoji on notes | Z.J. van de Weg | 2016-06-17 | 4 | -74/+341 |
| * | | | | | | Sort API endpoints and implement feedback | Z.J. van de Weg | 2016-06-17 | 5 | -35/+41 |
| * | | | | | | Add endpoints for Award Emoji | Z.J. van de Weg | 2016-06-17 | 5 | -1/+256 |
* | | | | | | | Merge branch 'commit-header' into 'master' | Jacob Schatz | 2016-06-17 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed issue with dropdown buttonscommit-header | Phil Hughes | 2016-06-17 | 1 | -1/+1 |
| * | | | | | | | Use line-height instead of height. | Jacob Schatz | 2016-06-17 | 2 | -3/+3 |
| * | | | | | | | Fixes header vertical centering. | Jacob Schatz | 2016-06-17 | 1 | -0/+2 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'fix-todos-counters' into 'master' | Robert Speicher | 2016-06-17 | 7 | -23/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-17 | 1 | -0/+1 |
| * | | | | | | | Ensure Todos counters doesn't count Todos for projects pending delete | Douglas Barbosa Alexandre | 2016-06-17 | 6 | -23/+50 |