summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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
* fix readability xterm colorsDanny2018-01-161-15/+14
|
* Merge branch ↵Rémy Coutable2018-01-161-1/+2
|\ | | | | | | | | | | | | | | | | '40818-last-push-widget-does-not-appear-after-pushing-new-commit' into 'master' Last push widget will show banner for new pushes to previously merged branch Closes #40818 See merge request gitlab-org/gitlab-ce!15728
| * Last push widget will show banner for new pushes to previously merged branchDrew Blessing2018-01-151-1/+2
| | | | | | | | | | | | Previously, the last push widget would only show when the branch never had a merge request associated with it - even merged or closed ones. Now the widget will disregard merge requests that are merged or closed.
* | Merge branch 'fix/pipeline-header-padding' into 'master'Filipa Lacerda2018-01-162-0/+2
|\ \ | | | | | | | | | | | | Add pipeline header padding See merge request gitlab-org/gitlab-ce!16496
| * | Add pipeline header paddingGeorge Tsiolis2018-01-162-0/+2
| | |
* | | Merge branch 'winh-style-modals' into 'master'Tim Zallmann2018-01-166-12/+37
|\ \ \ | | | | | | | | | | | | | | | | Adjust modal style to new design See merge request gitlab-org/gitlab-ce!16310
| * | | Adjust modal style to new designwinh-style-modalsWinnie Hellmann2018-01-116-12/+37
| | | |
* | | | Merge branch 'dispatcher-projects-c' into 'master'Phil Hughes2018-01-168-41/+85
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dispatcher changes for projects:c* views See merge request gitlab-org/gitlab-ce!16416
| * | | | typodispatcher-projects-cSimon Knox2018-01-161-1/+1
| | | | |
| * | | | add missing pages import for projects:compare:*Simon Knox2018-01-162-2/+8
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1628-81/+426
| |\ \ \ \ | | | | | | | | | | | | | | | | | | dispatcher-projects-c
| * | | | | fix exportsSimon Knox2018-01-152-2/+6
| | | | | |
| * | | | | fix broken import path from mergeSimon Knox2018-01-151-1/+1
| | | | | |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Simon Knox2018-01-1543-268/+411
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | dispatcher-projects-c
| * | | | | | export instancesSimon Knox2018-01-122-2/+2
| | | | | | |
| * | | | | | remove unusedSimon Knox2018-01-121-1/+0
| | | | | | |
| * | | | | | dispatcher pages for projects:clustersSimon Knox2018-01-123-12/+12
| | | | | | |
| * | | | | | dispatcher changes for projects:commit* viewsSimon Knox2018-01-125-24/+59
| | | | | | |
* | | | | | | Resolve "Icons on forks page are to big"Simon Knox2018-01-162-3/+3
| | | | | | |
* | | | | | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-162-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot search with keyword "merge"" Closes #41666 See merge request gitlab-org/gitlab-ce!16462
| * | | | | | | Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-mergeSean McGivern2018-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should use this limit everywhere, but especially in project search results, where we could be highlighting very long single lines. (Typical examples: minified JavaScript, and JSON data files.)
| * | | | | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
* | | | | | | | Merge branch '41921-follow-up-fixes' into 'master'Rémy Coutable2018-01-161-18/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor of buttons _dropdown partial Closes #41921 See merge request gitlab-org/gitlab-ce!16486
| * | | | | | | | Refactor of buttons _dropdown partialMark Fletcher2018-01-161-18/+8
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Remove block + interpolation to simplify the calls to link helpers
* | | | | | | | Merge branch 'fix/profile-gpg-keys-column-width' into 'master'Rémy Coutable2018-01-161-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change user settings column width See merge request gitlab-org/gitlab-ce!16479
| * | | | | | | | Change user settings column widthGeorge Tsiolis2018-01-161-2/+2
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'fix/activity-nav-inconsistent-capitalization' into 'master'Rémy Coutable2018-01-162-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix top-area inconsistent capitalization See merge request gitlab-org/gitlab-ce!16476
| * | | | | | | | Fix top-area inconsistent capitalizationGeorge Tsiolis2018-01-162-4/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-162-6/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error on changes tab when merge request cannot be created Closes #41460 See merge request gitlab-org/gitlab-ce!16409
| * | | | | | | | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-152-6/+6
| | | | | | | | |
* | | | | | | | | Merge branch 'dispatcher-milestones' into 'master'Filipa Lacerda2018-01-166-7/+37
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added imports for milestone dispatcher routes See merge request gitlab-org/gitlab-ce!16387
| * | | | | | | | | fixed eslintdispatcher-milestonesPhil Hughes2018-01-151-1/+0
| | | | | | | | | |
| * | | | | | | | | correctly init GFMPhil Hughes2018-01-153-4/+4
| | | | | | | | | |
| * | | | | | | | | Added imports for milestone dispatcher routesPhil Hughes2018-01-156-6/+37
| | | | | | | | | |
* | | | | | | | | | Merge branch 'mr-status-box-update' into 'master'Filipa Lacerda2018-01-162-9/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
| * | | | | | | | | | Fixed merge request status badge not updating after mergingmr-status-box-updatePhil Hughes2018-01-152-9/+8
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'Sean McGivern2018-01-161-4/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Commit#uri_type to Gitaly Closes gitaly#915 See merge request gitlab-org/gitlab-ce!16453
| * | | | | | | | | | Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitalyAhmad Sherif2018-01-151-4/+4
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#915
* | | | | | | | | | Merge branch '36571-ignore-root-in-repo' into 'master'Sean McGivern2018-01-161-2/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error while searching for text starting with slash "/"" Closes #36571 See merge request gitlab-org/gitlab-ce!16455
| * | | | | | | | | | Move Regexp.escape(), fix formatting on tests.Andrew McCallum2018-01-161-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Account for query of only forward slash(es).Andrew McCallum2018-01-151-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Create intermediary variable for query value with leading slashes removed.Andrew McCallum2018-01-151-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Add space after comma per layout guidelines.Andrew McCallum2018-01-151-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Strip off leading slashes when searching in context of repository.Andrew McCallum2018-01-151-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'issue-30101' into 'master'Rémy Coutable2018-01-161-15/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 'removed assignee' note to include old assignee reference Closes #30101 See merge request gitlab-org/gitlab-ce!16301
View Lorry Controller Status