Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' | Sean McGivern | 2016-11-11 | 2 | -0/+15 |
|\ | |||||
| * | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversion | Adam Niedzielski | 2016-11-10 | 2 | -0/+15 |
* | | Merge branch 'grapify-token-api' into 'master' | Rémy Coutable | 2016-11-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Grapify token API | Robert Schilling | 2016-11-10 | 1 | -1/+1 |
* | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into 'mast... | Douwe Maan | 2016-11-10 | 1 | -0/+49 |
|\ \ \ | |||||
| * | | | Evade some exceptions when using invalid references | Grzegorz Bizon | 2016-11-07 | 1 | -0/+49 |
* | | | | Merge branch 'grapify-milestone-api' into 'master' | Rémy Coutable | 2016-11-10 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | Grapify milestones APIgrapify-milestone-api | Robert Schilling | 2016-11-10 | 1 | -0/+9 |
| |/ / / | |||||
* | | | | Merge branch 'grapify-runners-api' into 'master' | Rémy Coutable | 2016-11-10 | 1 | -2/+2 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Grapify runners API | Robert Schilling | 2016-11-10 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'grapify-session-api' into 'master' | Rémy Coutable | 2016-11-10 | 1 | -7/+9 |
|\ \ \ | |||||
| * | | | Grapify the session APIgrapify-session-api | Robert Schilling | 2016-11-09 | 1 | -7/+9 |
| |/ / | |||||
* | | | Merge branch 'feature/api_owned_resource' into 'master' | Sean McGivern | 2016-11-10 | 2 | -0/+42 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Added API endpoint groups/owned | Borja Aparicio | 2016-11-08 | 1 | -0/+18 |
| * | | Added API spec test for projects/owned endpoint | Borja Aparicio | 2016-11-08 | 1 | -0/+24 |
* | | | Remove order-dependent expectation24341-fix-failure | Rémy Coutable | 2016-11-09 | 2 | -2/+2 |
* | | | Merge branch '23731-add-param-to-user-api' into 'master' | Sean McGivern | 2016-11-09 | 1 | -0/+21 |
|\ \ \ | |||||
| * | | | Add query param to filter users on 'external' & 'blocked' type on API | Yatish Mehta | 2016-11-08 | 1 | -0/+21 |
* | | | | Merge branch 'ldap_check_bind' into 'master' | Sean McGivern | 2016-11-09 | 2 | -4/+86 |
|\ \ \ \ | |||||
| * | | | | Introduce better credential and error checking to `rake gitlab:ldap:check` | Drew Blessing | 2016-11-08 | 2 | -4/+86 |
* | | | | | Merge branch 'remove-heading-space-from-diff-content' into 'master' | Alfredo Sumaran | 2016-11-09 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | Remove an extra leading space from diff content | Hiroyuki Sato | 2016-11-04 | 1 | -1/+1 |
* | | | | | | Merge branch 'pipeline-notifications' into 'master' | Sean McGivern | 2016-11-09 | 9 | -87/+245 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-11-08 | 46 | -283/+1326 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-11-05 | 35 | -143/+884 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-11-04 | 9 | -9/+109 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-11-03 | 11 | -5/+249 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-11-02 | 123 | -648/+2581 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-10-25 | 27 | -125/+478 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-10-24 | 13 | -4/+218 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Make sure pusher has the read_build privilege | Lin Jen-Shin | 2016-10-22 | 1 | -0/+2 |
| * | | | | | | | | | | | Test against notification email | Lin Jen-Shin | 2016-10-21 | 1 | -1/+1 |
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-10-21 | 11 | -100/+108 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Send only to users have :read_build access, feedback: | Lin Jen-Shin | 2016-10-21 | 1 | -51/+81 |
| * | | | | | | | | | | | | Should send to notification_email instead, feedback: | Lin Jen-Shin | 2016-10-20 | 1 | -1/+1 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-notifications | Lin Jen-Shin | 2016-10-20 | 82 | -540/+2017 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fix test for bcc changes | Lin Jen-Shin | 2016-10-18 | 1 | -3/+2 |
| * | | | | | | | | | | | | | Use bcc for pipeline emails because: | Lin Jen-Shin | 2016-10-18 | 3 | -13/+11 |
| * | | | | | | | | | | | | | Merge branch 'pipeline-emails' into pipeline-notifications | Lin Jen-Shin | 2016-10-18 | 16 | -74/+706 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Rename for a more consistent pipeline worker name, feedback: | Lin Jen-Shin | 2016-10-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | should_email_no_one -> should_not_email_anyone, feedback: | Lin Jen-Shin | 2016-10-17 | 3 | -4/+4 |
| * | | | | | | | | | | | | | | Fix test failure due to bad rebase, feedback: | Lin Jen-Shin | 2016-10-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | That's no longer a service [ci skip] | Lin Jen-Shin | 2016-10-17 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | Change service to be a worker, feedback: | Lin Jen-Shin | 2016-10-17 | 2 | -4/+6 |
| * | | | | | | | | | | | | | | Introduce email_recipients and use include? Feedback: | Lin Jen-Shin | 2016-10-17 | 1 | -7/+9 |
| * | | | | | | | | | | | | | | Fix test by having a real commit | Lin Jen-Shin | 2016-10-17 | 1 | -1/+9 |
| * | | | | | | | | | | | | | | Try to slightly optimize EmailHeleprs | Lin Jen-Shin | 2016-10-17 | 1 | -7/+11 |
| * | | | | | | | | | | | | | | Update the other sites for reset_delivered_emails! as well | Lin Jen-Shin | 2016-10-17 | 5 | -19/+19 |
| * | | | | | | | | | | | | | | Use EmailHelpers where possible, feedback: | Lin Jen-Shin | 2016-10-17 | 2 | -4/+7 |
| * | | | | | | | | | | | | | | Prefer methods from EmailHelpers, feedback: | Lin Jen-Shin | 2016-10-17 | 1 | -1/+1 |