Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | Refactor _allowed? methods as Rémy asked | Jacob Vosmaer | 2016-06-03 | 1 | -15/+9 |
| * | | | | Changes after more review from Rémy | Jacob Vosmaer | 2016-06-03 | 1 | -7/+9 |
| * | | | | Merge branch 'master' into git-http-controller | Jacob Vosmaer | 2016-06-02 | 685 | -6432/+9346 |
| |\ \ \ \ | |||||
| * | | | | | Make CI/Oauth/rate limiting reusable | Jacob Vosmaer | 2016-04-29 | 1 | -70/+8 |
| * | | | | | More changes suggested by Rémy | Jacob Vosmaer | 2016-04-25 | 1 | -19/+17 |
| * | | | | | Don't mess up our parent controller | Jacob Vosmaer | 2016-04-22 | 2 | -30/+28 |
| * | | | | | Some changes after review from Rémy and Valery | Jacob Vosmaer | 2016-04-22 | 1 | -28/+33 |
| * | | | | | Comment and whitespace | Jacob Vosmaer | 2016-04-15 | 1 | -9/+20 |
| * | | | | | Avoid path helper name clash | Jacob Vosmaer | 2016-04-15 | 1 | -4/+4 |
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-15 | 126 | -619/+1136 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-12 | 242 | -1621/+3644 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Clarify intentions | Jacob Vosmaer | 2016-04-06 | 1 | -4/+7 |
| * | | | | | | | Move workhorse protocol code into lib | Jacob Vosmaer | 2016-04-06 | 1 | -8/+5 |
| * | | | | | | | Add some upload specs | Jacob Vosmaer | 2016-03-24 | 1 | -7/+29 |
| * | | | | | | | Get Grack::Auth tests to pass | Jacob Vosmaer | 2016-03-23 | 2 | -5/+184 |
* | | | | | | | | Merge branch 'fix-endless-redirect' into 'master' | Rémy Coutable | 2016-06-08 | 2 | -6/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Fix endless redirections when accessing user OAuth applications when they are... | Stan Hu | 2016-06-08 | 2 | -6/+7 |
* | | | | | | | | Merge branch '18080-project-header-alignment' into 'master' | Jacob Schatz | 2016-06-08 | 2 | -5/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add flexbox to project header18080-project-header-alignment | Annabel Dunstone | 2016-06-01 | 2 | -5/+13 |
* | | | | | | | | | Merge branch '18074-cancel-pipeline-text' into 'master' | Jacob Schatz | 2016-06-08 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Change color of canceled ci text to gray18074-cancel-pipeline-text | Annabel Dunstone | 2016-06-01 | 1 | -1/+4 |
* | | | | | | | | | Merge branch 'optimise-email-css' into 'master' | Robert Speicher | 2016-06-07 | 2 | -28/+167 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Optimise email CSS for speed with Premaileroptimise-email-css | Sean McGivern | 2016-06-07 | 2 | -28/+167 |
* | | | | | | | | | Merge branch 'notification-dropdown-labels' into 'master' | Jacob Schatz | 2016-06-07 | 4 | -11/+45 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updated colorsnotification-dropdown-labels | Phil Hughes | 2016-06-07 | 1 | -0/+2 |
| * | | | | | | | | | Fixed failing tests | Phil Hughes | 2016-06-07 | 1 | -1/+1 |
| * | | | | | | | | | Notifications dropdown on project page now has descriptions | Phil Hughes | 2016-06-07 | 4 | -11/+43 |
* | | | | | | | | | | Merge branch '18058-sub-nav' into 'master' | Jacob Schatz | 2016-06-07 | 15 | -266/+345 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix alignment of wiki top area | Annabel Dunstone | 2016-06-07 | 2 | -1/+5 |
| * | | | | | | | | | | Align links and tabs18058-sub-nav | Annabel Dunstone | 2016-06-07 | 1 | -3/+6 |
| * | | | | | | | | | | Add scrolling tabs to code subnav | Annabel Dunstone | 2016-06-07 | 2 | -20/+41 |