summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix activity SVG17240-svgAnnabel Dunstone2016-06-082-11/+7
* Fix merge conflicts from removing links from sidebarAnnabel Dunstone2016-06-082-22/+4
* Add new icons to group page layout navAnnabel Dunstone2016-06-089-23/+97
* Add SVG icons to side barAnnabel Dunstone2016-06-088-179/+60
* Start adding SVG iconsAnnabel Dunstone2016-06-0810-0/+269
* 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 'knapsack-update-results-only-on-master' into 'master' Kamil Trzciński2016-06-081-0/+2
|\ \
| * | Update Knapsack report only on masterKamil Trzcinski2016-06-082-1/+5
* | | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse2016-06-087-8/+53
|\ \ \
| * | | Update CHANGELOGAlejandro Rodríguez2016-06-081-0/+1
| * | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-084-6/+50
| * | | Remove `projects` inclusion in `notes_with_associations` to skip some unneces...Alejandro Rodríguez2016-06-083-3/+3
| |/ /
* | | Merge branch 'improve-notification-settings-migrations' into 'master' Rémy Coutable2016-06-082-4/+31
|\ \ \
| * | | Remove notification settings in batchesYorick Peterse2016-06-082-4/+31
* | | | Merge branch 'remove-labels-from-filter' into 'master' Jacob Schatz2016-06-085-6/+90
|\ \ \ \
| * | | | Fixed issue with dropdown toggle not updatingremove-labels-from-filterPhil Hughes2016-06-083-2/+32
| * | | | 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-083-2/+36
* | | | | 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 'support-fog-azure' into 'master' Rémy Coutable2016-06-082-0/+22
|\ \ \ \ \
| * | | | | Add Azure to supported backup list (left out accidentally)Stan Hu2016-06-072-0/+22
| | |_|_|/ | |/| | |
* | | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-0813-330/+653
|\ \ \ \ \
| * | | | | Add parenthesesJacob Vosmaer2016-06-081-4/+4
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-08394-3208/+9533
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Remove code duplication in JwtControllerJacob Vosmaer2016-06-061-39/+1
| * | | | | Fix testsJacob Vosmaer2016-06-063-22/+22
| * | | | | Use public_sendJacob Vosmaer2016-06-031-2/+1
| * | | | | Argh mixed up all the negativesJacob Vosmaer2016-06-031-2/+2
| * | | | | Remove instances of Auth.newJacob Vosmaer2016-06-032-2/+2
| * | | | | Refactor Gitlab::Auth rate limitingJacob Vosmaer2016-06-032-25/+53
| * | | | | 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-033-24/+26
| * | | | | Rename finder to find_in_gitlab_or_ldapJacob Vosmaer2016-06-025-13/+13
| * | | | | Merge branch 'master' into git-http-controllerJacob Vosmaer2016-06-021580-11370/+32518
| |\ \ \ \ \
| * | | | | | Remove parallel assignmentJacob Vosmaer2016-05-031-1/+2
| * | | | | | Rubocop and whitespaceJacob Vosmaer2016-05-022-3/+3
| * | | | | | Use correct auth finderJacob Vosmaer2016-05-022-7/+2
| * | | | | | Make CI/Oauth/rate limiting reusableJacob Vosmaer2016-04-296-95/+158
| * | | | | | Specify that oauth cannot push codeJacob Vosmaer2016-04-291-0/+19
| * | | | | | More changes suggested by RémyJacob Vosmaer2016-04-251-19/+17
| * | | | | | Remove trivial 'let'Jacob Vosmaer2016-04-221-6/+5
| * | | | | | 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