summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sidekiq-job-throttling' into 'master' Douwe Maan2016-11-111-0/+28
|\
| * Refactored Sidekiq Throttler and updated documentationsidekiq-job-throttlingPatricio Cano2016-11-111-6/+0
| * Refactored initializer code to its own class and added testsPatricio Cano2016-11-101-0/+34
* | Merge branch 'vue2' into 'master' Fatih Acet2016-11-112-3/+1
|\ \
| * | Fixed tests for issue boards & diff note resolvingvue2Phil Hughes2016-11-101-2/+0
| * | Issue board spec fixesPhil Hughes2016-11-101-1/+1
| |/
* | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-111-4/+4
|\ \
| * | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-091-4/+4
* | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-112-0/+15
|\ \ \ | |_|/ |/| |
| * | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-102-0/+15
* | | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-101-1/+1
|\ \ \
| * | | Grapify token APIRobert Schilling2016-11-101-1/+1
* | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast...Douwe Maan2016-11-101-0/+49
|\ \ \ \
| * | | | Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-071-0/+49
* | | | | Merge branch 'grapify-milestone-api' into 'master' Rémy Coutable2016-11-101-0/+9
|\ \ \ \ \
| * | | | | Grapify milestones APIgrapify-milestone-apiRobert Schilling2016-11-101-0/+9
| |/ / / /
* | | | | Merge branch 'grapify-runners-api' into 'master' Rémy Coutable2016-11-101-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Grapify runners APIRobert Schilling2016-11-101-2/+2
| |/ / /
* | | | Merge branch 'grapify-session-api' into 'master' Rémy Coutable2016-11-101-7/+9
|\ \ \ \
| * | | | Grapify the session APIgrapify-session-apiRobert Schilling2016-11-091-7/+9
| |/ / /
* | | | Merge branch 'feature/api_owned_resource' into 'master' Sean McGivern2016-11-102-0/+42
|\ \ \ \ | |_|/ / |/| | |
| * | | Added API endpoint groups/ownedBorja Aparicio2016-11-081-0/+18
| * | | Added API spec test for projects/owned endpointBorja Aparicio2016-11-081-0/+24
* | | | Remove order-dependent expectation24341-fix-failureRémy Coutable2016-11-092-2/+2
* | | | Merge branch '23731-add-param-to-user-api' into 'master' Sean McGivern2016-11-091-0/+21
|\ \ \ \
| * | | | Add query param to filter users on 'external' & 'blocked' type on APIYatish Mehta2016-11-081-0/+21
| | |_|/ | |/| |
* | | | Merge branch 'ldap_check_bind' into 'master' Sean McGivern2016-11-092-4/+86
|\ \ \ \
| * | | | Introduce better credential and error checking to `rake gitlab:ldap:check`Drew Blessing2016-11-082-4/+86
* | | | | Merge branch 'remove-heading-space-from-diff-content' into 'master' Alfredo Sumaran2016-11-091-1/+1
|\ \ \ \ \
| * | | | | Remove an extra leading space from diff contentHiroyuki Sato2016-11-041-1/+1
* | | | | | Merge branch 'pipeline-notifications' into 'master' Sean McGivern2016-11-099-87/+245
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0846-283/+1326
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0535-143/+884
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-049-9/+109
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-0311-5/+249
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-11-02123-648/+2581
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2527-125/+478
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2413-4/+218
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make sure pusher has the read_build privilegeLin Jen-Shin2016-10-221-0/+2
| * | | | | | | | | | | Test against notification emailLin Jen-Shin2016-10-211-1/+1
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2111-100/+108
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Send only to users have :read_build access, feedback:Lin Jen-Shin2016-10-211-51/+81
| * | | | | | | | | | | | Should send to notification_email instead, feedback:Lin Jen-Shin2016-10-201-1/+1
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notificationsLin Jen-Shin2016-10-2082-540/+2017
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix test for bcc changesLin Jen-Shin2016-10-181-3/+2
| * | | | | | | | | | | | | Use bcc for pipeline emails because:Lin Jen-Shin2016-10-183-13/+11
| * | | | | | | | | | | | | Merge branch 'pipeline-emails' into pipeline-notificationsLin Jen-Shin2016-10-1816-74/+706
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Rename for a more consistent pipeline worker name, feedback:Lin Jen-Shin2016-10-171-1/+1
| * | | | | | | | | | | | | | should_email_no_one -> should_not_email_anyone, feedback:Lin Jen-Shin2016-10-173-4/+4
| * | | | | | | | | | | | | | Fix test failure due to bad rebase, feedback:Lin Jen-Shin2016-10-171-1/+1