summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | fixed specsPhil Hughes2018-01-162-1/+109
| | | | | | | | |
| * | | | | | | | removed console.logPhil Hughes2018-01-161-1/+0
| | | | | | | | |
| * | | | | | | | fixed shortcuts not working on some pagesPhil Hughes2018-01-163-7/+5
| | | | | | | | |
| * | | | | | | | Added dispatcher imports for some project routesPhil Hughes2018-01-1618-154/+51
| | | | | | | | |
* | | | | | | | | Merge branch 'remove-ide-pref' into 'master'Tim Zallmann2018-01-181-17/+0
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE option from user preferences See merge request gitlab-org/gitlab-ce!16454
| * | | | | | | | Remove IDE option from user preferencesPhil Hughes2018-01-151-17/+0
| | | | | | | | |
* | | | | | | | | 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 browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537
| * | | | | | | | Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typoStan Hu2018-01-171-1/+5
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()` expects to see `startOnLoad` in the `mermaid` hash: https://github.com/knsv/mermaid/blob/6cd5ffe637d88525b93417bf3954e9c0e5a4deb8/src/mermaid.js#L118 Closes #42052
* | | | | | | | Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-1815-45/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with .public_send we can't make sure that the scope on the model actually exists.
| * | | | | | | | 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 area Closes #41305 See merge request gitlab-org/gitlab-ce!16283
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot filter issues by labels ending with a plus char in board view" Closes #41715 and #34252 See merge request gitlab-org/gitlab-ce!16490
| * | | | | | | | | 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 Analytics (between 1st iteration and 2nd iteration) Closes #41743 See merge request gitlab-org/gitlab-ce!16270
| * | | | | | | | | | 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 screens See merge request gitlab-org/gitlab-ce!16534
| * | | | | | | | | | | 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.haml See merge request gitlab-org/gitlab-ce!16503
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Prevent login with disabled OAuth providers See merge request gitlab/gitlabhq!2296 (cherry picked from commit 4936650427ffc88e6ee927aedbb2c724d24b094c) a0f9d222 Prevents login with disabled OAuth providers
| * | | | | | | | | Merge branch 'fl-ipythin-10-3' into 'security-10-3'Phil Hughes2018-01-162-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port of [10.2] Sanitizes IPython notebook output See merge request gitlab/gitlabhq!2285 (cherry picked from commit 1c46e031c70706450a8e0ae730f4c323b72f9e4c) aac035fe Port of [10.2] Sanitizes IPython notebook output
| * | | | | | | | | Merge branch ↵Robert Speicher2018-01-162-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
| * | | | | | | | | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-1611-43/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
| * | | | | | | | | Merge branch '41567-projectfix' into 'security-10-3'Sean McGivern2018-01-161-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create
| * | | | | | | | | Merge branch 'sh-validate-path-project-import-10-3' into 'security-10-3'Stan Hu2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate project path in Gitlab import - 10.3 port See merge request gitlab/gitlabhq!2268 (cherry picked from commit 94c82376d66fc80d46dd2d5eeb5bade408ec6a7e) 2b94a7c2 Validate project path in Gitlab import
| * | | | | | | | | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-164-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder See merge request gitlab/gitlabhq!2259 (cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d) 155881e7 Remove order param from the MilestoneFinder
| * | | | | | | | | Merge branch 'label-xss-10-3' into 'security-10-3'Jacob Schatz2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [10.3] Fix XSS in issue label dropdown See merge request gitlab/gitlabhq!2253 (cherry picked from commit 363ffabcebd7bb0d1a2d59ca1a75e4eadb4a4360) ea1fb0ea Fix XSS in issue label dropdown
| * | | | | | | | | Merge branch ↵Stan Hu2018-01-161-0/+5
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3-do-not-expose-passwords-or-tokens-in-service-integrations-api' into 'security-10-3' Filter out sensitive fields from the project services API See merge request gitlab/gitlabhq!2281 (cherry picked from commit 476f2576444632f2a9a61b4cead9c1077f2c81d7) 2bcbbda0 Filter out sensitive fields from the project services API
* | | | | | | | | 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
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The performance bar is still displayed by default in development. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch '42035-projects-dropdown-scroll' into 'master'Tim Zallmann2018-01-172-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects dropdown width and height shrinked, causes scrollbars wrapping around" Closes #42035 See merge request gitlab-org/gitlab-ce!16507
| * | | | | | | | 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' ↵Filipa Lacerda2018-01-171-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix JS bundle not running on the Cluster update/destroy pages -- CE backport Closes gitlab-ee#4378 See merge request gitlab-org/gitlab-ce!16506
View Lorry Controller Status