summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix conflict with ee iconmr-widget-vueFilipa Lacerda2018-01-181-1/+1
* Move archived component to vue fileFilipa Lacerda2018-01-184-27/+35
* Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-181-20/+26
* Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master'Jacob Schatz2018-01-181-1/+5
|\
| * Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typoStan Hu2018-01-171-1/+5
* | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-1815-45/+89
|\ \
| * | reference triggers.values for permitted parametersAlexis Reigel2018-01-172-14/+3
| * | add missing permitted paramAlexis Reigel2018-01-171-0/+1
| * | use class reader instead of dynamic constantAlexis Reigel2018-01-176-10/+12
| * | no need for a named parameterAlexis Reigel2018-01-172-2/+2
| * | accepts `.all` as a hook scope as wellAlexis Reigel2018-01-171-1/+2
| * | use safer .hooks_for instead of .public_sendAlexis Reigel2018-01-173-2/+8
| * | extract concern for hook triggersAlexis Reigel2018-01-173-23/+50
| * | use sentence case for "Merge request events"Alexis Reigel2018-01-042-2/+2
| * | merge requests on system hook admin pageAlexis Reigel2018-01-041-0/+7
| * | test hook for system merge request hookAlexis Reigel2018-01-041-0/+7
| * | invoke SystemHooksService instead of direct modelAlexis Reigel2018-01-041-3/+1
| * | execute system hooks from projectAlexis Reigel2018-01-042-1/+7
* | | Merge branch 'winh-stop-jobs-modal' into 'master'Phil Hughes2018-01-186-2/+89
|\ \ \
| * | | Add modal for stopping jobs in admin areaWinnie Hellmann2018-01-186-2/+89
* | | | Merge branch '34252-trailing-plus' into 'master'Phil Hughes2018-01-181-1/+1
|\ \ \ \
| * | | | fix board filter parsing - don't replace encoded + symbols with spacesSimon Knox2018-01-161-1/+1
* | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master'Annabel Dunstone Gray2018-01-181-41/+0
|\ \ \ \ \
| * | | | | Remove unused CSS selectors for Cycle AnalyticsTakuya Noguchi2018-01-071-41/+0
* | | | | | Merge branch 'file-content-large-screen-padding' into 'master'Annabel Dunstone Gray2018-01-171-0/+4
|\ \ \ \ \ \
| * | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-paddingtauriedavis2018-01-171-0/+4
* | | | | | | Filter groups and projects dropdowns of search page on backendWinnie Hellmann2018-01-171-0/+2
* | | | | | | Merge branch 'rs-buttons-partial' into 'master'Rémy Coutable2018-01-171-21/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partialRobert Speicher2018-01-161-21/+14
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-1724-75/+165
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fixed conflictsPhil Hughes2018-01-172-44/+17
| * | | | | Merge branch 'jej/fix-disabled-oauth-access-10-3' into 'security-10-3'Robert Speicher2018-01-161-0/+9
| * | | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-162-2/+33
| * | | | | Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-q...Robert Speicher2018-01-162-1/+2
| * | | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-1611-43/+98
| * | | | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-6/+22
| * | | | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-1/+1
| * | | | | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-164-18/+18
| * | | | | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-161-1/+1
| * | | | | Merge branch 'security-10-3-do-not-expose-passwords-or-tokens-in-service-inte...Stan Hu2018-01-161-0/+5
| |/ / / /
* | | | | Open visibility help in new tabJussi Räsänen2018-01-171-1/+1
* | | | | Resolve "Closed issue label in todo's styling is difficult to read"Simon Knox2018-01-175-12/+19
* | | | | In development, allow the toggling of the performance barRémy Coutable2018-01-172-4/+13
* | | | | Merge branch '42035-projects-dropdown-scroll' into 'master'Tim Zallmann2018-01-172-1/+3
|\ \ \ \ \
| * | | | | Restore custom height for projects dropdown42035-projects-dropdown-scrollAnnabel Dunstone Gray2018-01-162-1/+3
| |/ / / /
* | | | | Merge branch 'ce-backport-4378-fix-cluster-js-not-running-on-update-page' int...Filipa Lacerda2018-01-171-0/+2
|\ \ \ \ \
| * | | | | Fix JS bundle not running on the Cluster update/destroy pagesce-backport-4378-fix-cluster-js-not-running-on-update-pageEric Eastwood2018-01-161-0/+2
| |/ / / /
* | | | | Merge branch 'merge-request-target-branch-perf' into 'master'Filipa Lacerda2018-01-175-9/+52
|\ \ \ \ \
| * | | | | fixed missing commamerge-request-target-branch-perfPhil Hughes2018-01-161-1/+1
| * | | | | actual spec fixesPhil Hughes2018-01-161-0/+1