Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove CI/CD models directory from `eager_load_paths`fix/gb/remove-ci-models-from-eager-load-paths | Grzegorz Bizon | 2017-05-05 | 1 | -1/+0 |
* | Merge branch 'cycle-anyltics-landing-box-fix' into 'master' | Annabel Dunstone Gray | 2017-05-05 | 2 | -11/+30 |
|\ | |||||
| * | Fixed cycle analytics intro box styling regressioncycle-anyltics-landing-box-fix | Phil Hughes | 2017-05-05 | 2 | -11/+30 |
* | | Merge branch '31689-request-access-spacing' into 'master' | Annabel Dunstone Gray | 2017-05-05 | 4 | -5/+7 |
|\ \ | |||||
| * | | 31689 Add default margin-top to user request table on project members page31689-request-access-spacing | tauriedavis | 2017-05-04 | 4 | -5/+7 |
* | | | Merge 'dev/master' into master | Ruben Davila | 2017-05-05 | 7 | -12/+56 |
|\ \ \ | |||||
| * | | | Update CHANGELOG.md for 9.1.3 | Lin Jen-Shin | 2017-05-05 | 1 | -0/+1 |
| * | | | Update CHANGELOG.md for 8.17.6 | Lin Jen-Shin | 2017-05-05 | 1 | -0/+11 |
| * | | | Update CHANGELOG.md for 9.0.7 | Lin Jen-Shin | 2017-05-05 | 1 | -0/+12 |
| * | | | Update CHANGELOG.md for 9.1.3 | Lin Jen-Shin | 2017-05-05 | 1 | -0/+11 |
| * | | | Merge branch 'droplab-templating-xss-fix' into 'master' | Jacob Schatz | 2017-05-03 | 6 | -12/+21 |
| |\ \ \ | |||||
| | * | | | [ci skip] Add comment to regex | Luke "Jared" Bennett | 2017-04-27 | 1 | -1/+2 |
| | * | | | Merge remote-tracking branch 'origin/master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-26 | 65 | -202/+336 |
| | |\ \ \ | |||||
| | * | | | | Fixed being behind | Luke "Jared" Bennett | 2017-04-26 | 12 | -28/+181 |
| | * | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-25 | 285 | -6534/+2140 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed dodgy merge | Luke "Jared" Bennett | 2017-04-24 | 12 | -181/+28 |
| | * | | | | | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-24 | 745 | -6430/+9980 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-17 | 15 | -60/+149 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-15 | 19 | -39/+169 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into droplab-templating-xss-fix | Luke "Jared" Bennett | 2017-04-14 | 193 | -3172/+4966 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update specs | Luke "Jared" Bennett | 2017-04-12 | 2 | -2/+8 |
| | * | | | | | | | | | Used underscore to template list children to utilize their simple escaped int... | Luke "Jared" Bennett | 2017-04-12 | 4 | -10/+12 |
* | | | | | | | | | | | Merge branch '12910-personal-snippets-notes' into 'master' | Sean McGivern | 2017-05-05 | 34 | -92/+359 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Support comments for personal snippets | Jarka Kadlecova | 2017-05-05 | 34 | -92/+359 |
* | | | | | | | | | | | | Merge branch 'remove-frontend-team-label' into 'master' | Rémy Coutable | 2017-05-05 | 1 | -3/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Remove FE team label | Sean McGivern | 2017-05-05 | 1 | -3/+6 |
* | | | | | | | | | | | | | Merge branch '31727-timestamps-in-merge-request-discussion-overflow-role-badg... | Annabel Dunstone Gray | 2017-05-05 | 1 | -6/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Wrap note actions below timestamp on discussions | Sam Rose | 2017-05-05 | 1 | -6/+10 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'backport-ee-4b464eaaee' into 'master' | Robert Speicher | 2017-05-05 | 5 | -8/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Backport avatar-related spec changes from gitlab-org/gitlab-ee@4b464eaaeebackport-ee-4b464eaaee | Rémy Coutable | 2017-05-04 | 5 | -8/+38 |
* | | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' | Robert Speicher | 2017-05-05 | 5 | -1/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fix | Jose Ivan Vargas | 2017-05-04 | 3 | -3/+3 |
| * | | | | | | | | | | | | | Improved code styling and added a HTTParty rescue block | Jose Ivan Vargas | 2017-05-04 | 4 | -22/+29 |
| * | | | | | | | | | | | | | Added specs | Jose Ivan Vargas | 2017-05-04 | 3 | -5/+33 |
| * | | | | | | | | | | | | | Added rescue block for the test method for the prometheus service | Jose Ivan Vargas | 2017-05-04 | 3 | -3/+12 |
* | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout' | Sean McGivern | 2017-05-05 | 5 | -2/+51 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeout | Chris Wilson | 2017-04-27 | 5 | -2/+51 |
* | | | | | | | | | | | | | | | Merge branch '31747-fix-transient-failures-when-tests-run-too-fast' into 'mas... | Sean McGivern | 2017-05-05 | 2 | -9/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Set minimum latency to be non-negative number. | Pawel Chojnacki | 2017-05-05 | 2 | -9/+9 |
* | | | | | | | | | | | | | | | Merge branch 'fix-email-receiver-metrics' into 'master' | Rémy Coutable | 2017-05-05 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Fix email receiver metrics eventsfix-email-receiver-metrics | Sean McGivern | 2017-05-05 | 3 | -3/+3 |
| |/ / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch 'issue-boards-no-avatar' into 'master' | Filipa Lacerda | 2017-05-05 | 8 | -12/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Changed how the default avatar is setissue-boards-no-avatar | Phil Hughes | 2017-05-04 | 7 | -14/+33 |
| * | | | | | | | | | | | | | | | Merge branch 'master' into issue-boards-no-avatar | Phil Hughes | 2017-05-04 | 667 | -3440/+13617 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fixed avatar not displaying in issue boards | Phil Hughes | 2017-04-28 | 4 | -1/+8 |
* | | | | | | | | | | | | | | | | | Merge branch '27614-instant-comments' into 'master' | Filipa Lacerda | 2017-05-05 | 16 | -65/+607 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Add instant comments support | Kushal Pandya | 2017-05-05 | 16 | -65/+607 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch '30237-pipelines-actions-make-2-requests' into 'master' | Kamil Trzciński | 2017-05-05 | 3 | -3/+53 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Add specs for new pipeline action for JSON format30237-pipelines-actions-make-2-requests | Grzegorz Bizon | 2017-05-05 | 1 | -0/+36 |
| * | | | | | | | | | | | | | | | | Use wrap_parameters in pipelines controller | Grzegorz Bizon | 2017-05-05 | 1 | -0/+2 |