Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '18019-fix-wiki-linking' into 'master' | Rémy Coutable | 2016-06-09 | 3 | -4/+4 |
|\ | |||||
| * | Hook up the updated `WikiLinkFilter` to the wiki controllers. | Timothy Andrew | 2016-06-09 | 3 | -4/+4 |
* | | Merge branch 'fix-award-emoji-hidden' into 'master' | Jacob Schatz | 2016-06-09 | 1 | -1/+2 |
|\ \ | |||||
| * | | Shows award emoji for comments to all users who are logged in. | Connor Shea | 2016-06-08 | 1 | -1/+2 |
* | | | Merge branch 'mention-loading-indicator' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -5/+73 |
|\ \ \ | |||||
| * | | | Show loading indicator for autocompletemention-loading-indicator | Phil Hughes | 2016-05-25 | 1 | -5/+73 |
* | | | | Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -5/+8 |
|\ \ \ \ | |||||
| * | | | | Added a line to find the currently saved text and replace the markdown textar... | Luke Bennett | 2016-06-07 | 1 | -5/+8 |
* | | | | | Merge branch 'nav-scroll-bug' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -1/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Side nav scrolls if content height taller than screennav-scroll-bug | Annabel Dunstone | 2016-06-07 | 1 | -1/+8 |
* | | | | | | Merge branch 'git-http-no-authenticity-token' into 'master' | Robert Speicher | 2016-06-08 | 1 | -0/+2 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Skip authenticity token checks for Git HTTP | Jacob Vosmaer | 2016-06-08 | 1 | -0/+2 |
* | | | | | | Merge branch '17240-svg' into 'master' | Jacob Schatz | 2016-06-08 | 19 | -28/+230 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix activity SVG17240-svg | Annabel Dunstone | 2016-06-08 | 2 | -11/+7 |
| * | | | | | | Fix merge conflicts from removing links from sidebar | Annabel Dunstone | 2016-06-08 | 2 | -22/+4 |
| * | | | | | | Add new icons to group page layout nav | Annabel Dunstone | 2016-06-08 | 9 | -23/+97 |
| * | | | | | | Add SVG icons to side bar | Annabel Dunstone | 2016-06-08 | 8 | -179/+60 |
| * | | | | | | Start adding SVG icons | Annabel Dunstone | 2016-06-08 | 10 | -0/+269 |
* | | | | | | | Merge branch '18333-layout-bug' into 'master' | Jacob Schatz | 2016-06-08 | 3 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use container helper instead of hard coded container | Annabel Dunstone | 2016-06-08 | 3 | -3/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'dropdown-link-lineheight' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fixed dropdown line-heightdropdown-link-lineheight | Phil Hughes | 2016-06-08 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'dz-improve-ui-consistency' into 'master' | Jacob Schatz | 2016-06-08 | 18 | -38/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove unnecessary icons from buttonsdz-improve-ui-consistency | Dmitriy Zaporozhets | 2016-06-08 | 9 | -13/+5 |
| * | | | | | | | | Cleanup and imrpove issue/mr buttons | Dmitriy Zaporozhets | 2016-06-08 | 8 | -20/+27 |
| * | | | | | | | | Improve button color for issue and mr pages | Dmitriy Zaporozhets | 2016-06-08 | 3 | -8/+8 |
| * | | | | | | | | Use hex value instead of rgba for gray border color | Dmitriy Zaporozhets | 2016-06-08 | 1 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' | Robert Speicher | 2016-06-08 | 6 | -2/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 6 | -2/+26 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'password-min-length-placeholder' into 'master' | Robert Speicher | 2016-06-08 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Added minimum password length to password fieldpassword-min-length-placeholder | Phil Hughes | 2016-06-03 | 2 | -1/+2 |
* | | | | | | | | Merge branch 'admin-nav' into 'master' | Jacob Schatz | 2016-06-08 | 2 | -27/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update explore sidebaradmin-nav | Annabel Dunstone | 2016-06-07 | 1 | -4/+4 |
| * | | | | | | | | Update admin sidebar | Annabel Dunstone | 2016-06-07 | 1 | -23/+19 |
* | | | | | | | | | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' | Yorick Peterse | 2016-06-08 | 3 | -5/+23 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIs | Alejandro Rodríguez | 2016-06-08 | 1 | -3/+21 |
| * | | | | | | | | Remove `projects` inclusion in `notes_with_associations` to skip some unneces... | Alejandro Rodríguez | 2016-06-08 | 3 | -3/+3 |
* | | | | | | | | | Merge branch 'remove-labels-from-filter' into 'master' | Jacob Schatz | 2016-06-08 | 4 | -6/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed issue with dropdown toggle not updatingremove-labels-from-filter | Phil Hughes | 2016-06-08 | 2 | -2/+7 |
| * | | | | | | | | | Darken the border between remove label and label name | Phil Hughes | 2016-06-08 | 1 | -1/+1 |
| * | | | | | | | | | Updated design | Phil Hughes | 2016-06-08 | 3 | -9/+29 |
| * | | | | | | | | | Removable labels from filtered issuables label bar | Phil Hughes | 2016-06-08 | 2 | -2/+26 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'webhooks-shared-form' into 'master' | Jacob Schatz | 2016-06-08 | 2 | -91/+92 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Backported from EE shared form for web hookswebhooks-shared-form | Phil Hughes | 2016-06-03 | 2 | -91/+92 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'git-http-controller' into 'master' | Rémy Coutable | 2016-06-08 | 2 | -40/+147 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-06-08 | 184 | -1342/+2758 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Remove code duplication in JwtController | Jacob Vosmaer | 2016-06-06 | 1 | -39/+1 |
| * | | | | | | | | Remove instances of Auth.new | Jacob Vosmaer | 2016-06-03 | 1 | -1/+1 |
| * | | | | | | | | Fewer silly instance variables | Jacob Vosmaer | 2016-06-03 | 1 | -11/+9 |
| * | | | | | | | | Use #present? | Jacob Vosmaer | 2016-06-03 | 1 | -1/+1 |