Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emails | Lin Jen-Shin | 2016-10-18 | 2 | -6/+21 |
|\ | |||||
| * | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 5 | -19/+73 |
| |\ | |||||
| * | | Fix specs | Sean McGivern | 2016-10-13 | 1 | -2/+2 |
| * | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 2 | -6/+21 |
* | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-17 | 4 | -18/+48 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Jacob Schatz | 2016-10-15 | 1 | -0/+4 |
| |\ \ | |||||
| | * | | Handle unmatched routing with not_found method | Dmitriy Zaporozhets | 2016-10-15 | 1 | -0/+4 |
| * | | | Add exists to users routes and fix endpoint. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| * | | | Attempt to fix username validation ruby. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| * | | | Stringify username before passing to ActiveRecord. | Bryce Johnson | 2016-10-15 | 1 | -1/+1 |
| * | | | Make UX upgrades to SignIn/Register views. | Bryce Johnson | 2016-10-15 | 1 | -1/+5 |
| |/ / | |||||
| * | | Merge branch 'members-ui' into 'master' | Fatih Acet | 2016-10-14 | 2 | -17/+39 |
| |\ \ | |||||
| | * | | Changed how collections are rendered | Phil Hughes | 2016-10-06 | 1 | -15/+0 |
| | * | | Merge branch 'master' into members-ui | Phil Hughes | 2016-10-06 | 9 | -51/+92 |
| | |\ \ | |||||
| | * | | | Updated Ruby variable name | Phil Hughes | 2016-10-05 | 1 | -5/+3 |
| | * | | | Updated Ruby | Phil Hughes | 2016-10-04 | 2 | -3/+4 |
| | * | | | Merge branch 'master' into members-ui | Phil Hughes | 2016-10-04 | 27 | -110/+234 |
| | |\ \ \ | |||||
| | * | | | | Group links search test fix | Phil Hughes | 2016-09-13 | 1 | -0/+4 |
| | * | | | | Added back ordering | Phil Hughes | 2016-09-13 | 1 | -0/+1 |
| | * | | | | Ruby update | Phil Hughes | 2016-09-13 | 1 | -7/+7 |
| | * | | | | Removed group members from the list for now | Phil Hughes | 2016-09-13 | 1 | -25/+0 |
| | * | | | | Fixed bug when group_ids not present when creating | Phil Hughes | 2016-09-13 | 1 | -9/+11 |
| | * | | | | Search project groups | Phil Hughes | 2016-09-13 | 1 | -8/+41 |
| | * | | | | Fixed removing groups | Phil Hughes | 2016-09-13 | 1 | -1/+6 |
| | * | | | | Added test for updating groups permissions | Phil Hughes | 2016-09-13 | 1 | -1/+1 |
| | * | | | | Fixed error when updating groups | Phil Hughes | 2016-09-13 | 1 | -1/+1 |
| | * | | | | Updated some specs | Phil Hughes | 2016-09-13 | 1 | -10/+9 |
| | * | | | | Fixed search | Phil Hughes | 2016-09-13 | 1 | -6/+15 |
| | * | | | | Fixed issue with invited users not showing up | Phil Hughes | 2016-09-13 | 1 | -1/+13 |
| | * | | | | Fixed members error | Phil Hughes | 2016-09-13 | 1 | -1/+1 |
| | * | | | | Return 403 if user can't update group | Phil Hughes | 2016-09-13 | 1 | -0/+1 |
| | * | | | | Removes row from dom when deleting | Phil Hughes | 2016-09-13 | 1 | -5/+2 |
| | * | | | | Fixed group members not deleting | Phil Hughes | 2016-09-13 | 1 | -4/+5 |
| | * | | | | Fixed issue with groups not displaying | Phil Hughes | 2016-09-13 | 1 | -14/+0 |
| | * | | | | Included groups on project_members page | Phil Hughes | 2016-09-13 | 2 | -0/+13 |
* | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-14 | 13 | -124/+104 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add test, fix merge errorzj-show-deployed-time-ago | Z.J. van de Weg | 2016-10-14 | 1 | -1/+2 |
| * | | | | | Minor style improvement | Z.J. van de Weg | 2016-10-14 | 1 | -14/+6 |
| * | | | | | Rename method in test | Z.J. van de Weg | 2016-10-14 | 1 | -18/+23 |
| * | | | | | Moved ci_status environments logic to new action ci_envrionments_status and s... | Luke Bennett | 2016-10-14 | 1 | -18/+20 |
| * | | | | | Refactor ci_status on MergeRequestController | Z.J. van de Weg | 2016-10-14 | 1 | -25/+20 |
| * | | | | | Show what time ago a MR was deployed | Z.J. van de Weg | 2016-10-14 | 1 | -1/+30 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'use-language-colours-for-graph' into 'master' | Sean McGivern | 2016-10-13 | 1 | -3/+3 |
| |\ \ \ \ | |||||
| | * | | | | Use Linguist::Language[] instead of creating a hash | Georg G | 2016-10-10 | 1 | -5/+1 |
| | * | | | | Use defined colour for a language when available | Georg G | 2016-10-07 | 1 | -3/+7 |
| * | | | | | Merge branch 'feature/issues-board' into 'master' | Sean McGivern | 2016-10-13 | 4 | -81/+39 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix board relates specs | Douglas Barbosa Alexandre | 2016-10-11 | 1 | -1/+1 |
| | * | | | | | Refactoring service to create a new issue in a board list | Douglas Barbosa Alexandre | 2016-10-11 | 1 | -3/+2 |
| | * | | | | | Remove unused Projects::BoardListsController controller | Douglas Barbosa Alexandre | 2016-10-11 | 1 | -65/+0 |
| | * | | | | | Update endpoints to handle with board issues | Douglas Barbosa Alexandre | 2016-10-11 | 1 | -2/+2 |