summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'admin-nav' into 'master' Jacob Schatz2016-06-082-27/+23
|\
| * Update explore sidebaradmin-navAnnabel Dunstone2016-06-071-4/+4
| * Update admin sidebarAnnabel Dunstone2016-06-071-23/+19
* | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse2016-06-083-5/+23
|\ \
| * | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-081-3/+21
| * | Remove `projects` inclusion in `notes_with_associations` to skip some unneces...Alejandro Rodríguez2016-06-083-3/+3
* | | Merge branch 'remove-labels-from-filter' into 'master' Jacob Schatz2016-06-084-6/+55
|\ \ \
| * | | Fixed issue with dropdown toggle not updatingremove-labels-from-filterPhil Hughes2016-06-082-2/+7
| * | | Darken the border between remove label and label namePhil Hughes2016-06-081-1/+1
| * | | Updated designPhil Hughes2016-06-083-9/+29
| * | | Removable labels from filtered issuables label barPhil Hughes2016-06-082-2/+26
* | | | Merge branch 'webhooks-shared-form' into 'master' Jacob Schatz2016-06-082-91/+92
|\ \ \ \ | |_|/ / |/| | |
| * | | Backported from EE shared form for web hookswebhooks-shared-formPhil Hughes2016-06-032-91/+92
* | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-082-40/+147
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-08184-1342/+2758
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Remove code duplication in JwtControllerJacob Vosmaer2016-06-061-39/+1
| * | | | Remove instances of Auth.newJacob Vosmaer2016-06-031-1/+1
| * | | | Fewer silly instance variablesJacob Vosmaer2016-06-031-11/+9
| * | | | Use #present?Jacob Vosmaer2016-06-031-1/+1
| * | | | Refactor _allowed? methods as Rémy askedJacob Vosmaer2016-06-031-15/+9
| * | | | Changes after more review from RémyJacob Vosmaer2016-06-031-7/+9
| * | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-02685-6432/+9346
| |\ \ \ \
| * | | | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-291-70/+8
| * | | | | More changes suggested by RémyJacob Vosmaer2016-04-251-19/+17
| * | | | | Don't mess up our parent controllerJacob Vosmaer2016-04-222-30/+28
| * | | | | Some changes after review from Rémy and ValeryJacob Vosmaer2016-04-221-28/+33
| * | | | | Comment and whitespaceJacob Vosmaer2016-04-151-9/+20
| * | | | | Avoid path helper name clashJacob Vosmaer2016-04-151-4/+4
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-15126-619/+1136
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-04-12242-1621/+3644
| |\ \ \ \ \ \
| * | | | | | | Clarify intentionsJacob Vosmaer2016-04-061-4/+7
| * | | | | | | Move workhorse protocol code into libJacob Vosmaer2016-04-061-8/+5
| * | | | | | | Add some upload specsJacob Vosmaer2016-03-241-7/+29
| * | | | | | | Get Grack::Auth tests to passJacob Vosmaer2016-03-232-5/+184
* | | | | | | | Merge branch 'fix-endless-redirect' into 'master' Rémy Coutable2016-06-082-6/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix endless redirections when accessing user OAuth applications when they are...Stan Hu2016-06-082-6/+7
* | | | | | | | Merge branch '18080-project-header-alignment' into 'master' Jacob Schatz2016-06-082-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Add flexbox to project header18080-project-header-alignmentAnnabel Dunstone2016-06-012-5/+13
* | | | | | | | | Merge branch '18074-cancel-pipeline-text' into 'master' Jacob Schatz2016-06-081-1/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Change color of canceled ci text to gray18074-cancel-pipeline-textAnnabel Dunstone2016-06-011-1/+4
* | | | | | | | | Merge branch 'optimise-email-css' into 'master' Robert Speicher2016-06-072-28/+167
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Optimise email CSS for speed with Premaileroptimise-email-cssSean McGivern2016-06-072-28/+167
* | | | | | | | | Merge branch 'notification-dropdown-labels' into 'master' Jacob Schatz2016-06-074-11/+45
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated colorsnotification-dropdown-labelsPhil Hughes2016-06-071-0/+2
| * | | | | | | | | Fixed failing testsPhil Hughes2016-06-071-1/+1
| * | | | | | | | | Notifications dropdown on project page now has descriptionsPhil Hughes2016-06-074-11/+43
* | | | | | | | | | Merge branch '18058-sub-nav' into 'master' Jacob Schatz2016-06-0715-266/+345
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix alignment of wiki top areaAnnabel Dunstone2016-06-072-1/+5
| * | | | | | | | | | Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
| * | | | | | | | | | Add scrolling tabs to code subnavAnnabel Dunstone2016-06-072-20/+41