summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Added Stylelint SetupTim Zallmann2019-02-1414-46/+40
| | | | | | | | Added stylelint to static-analysis Updated yarn dependencies CSS Fixes and rule adoptions of stylelint Added stylelint-scss Deduplicated yarn.lock to clear dependencies
* Merge branch '9721-cannot-scroll-forwards-in-time-for-roadmap-view-ce' into ↵Phil Hughes2019-02-141-1/+1
|\ | | | | | | | | | | | | 'master' CE Port of fix for roadmap forward timeline scroll See merge request gitlab-org/gitlab-ce!25217
| * CE Port of fix for roadmap forward timeline scrollConstance Okoghenun2019-02-131-1/+1
| | | | | | | | EE MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/9530
* | Merge branch 'bvl-multiple-codeowner-approval-rules-ce' into 'master'Rémy Coutable2019-02-141-0/+1
|\ \ | | | | | | | | | | | | Add a scope to preload emails on a user See merge request gitlab-org/gitlab-ce!25051
| * | Add a scope to preload emails on a userBob Van Landuyt2019-02-081-0/+1
| | |
* | | Fix polling for replies to individual notesHeinrich Lee Yu2019-02-146-24/+49
| | | | | | | | | | | | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* | | Merge branch '57544-web-ide-new-directory-dialog-shows-file-templates' into ↵Phil Hughes2019-02-141-4/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Web IDE new directory dialog shows file templates" Closes #57544 See merge request gitlab-org/gitlab-ce!25119
| * | | Dont show file template options for new directorySam Bigelow2019-02-131-4/+10
| | | |
* | | | Fixed link alignmentNatalia Tepluhina2019-02-142-2/+7
| | | |
* | | | Merge branch '30299-fix-polling-for-transformed-notes' into 'master'Douwe Maan2019-02-133-5/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix polling for transformed individual notes See merge request gitlab-org/gitlab-ce!25084
| * | | | Fix polling for transformed individual notes30299-fix-polling-for-transformed-notesHeinrich Lee Yu2019-02-133-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Sets `updated_at` so that the transformed note is returned together with the new reply
* | | | | Fix Content-Disposition hard-coded to attachmentsStan Hu2019-02-131-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24919, Content-Disposition is hard-coded to `attachment` instead of `inline`. We now use the argument `disposition` to fix that problem. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/57660
* | | | Merge branch '57160-merge-request-tabs-header-is-missing-bottom-border' into ↵Annabel Dunstone Gray2019-02-131-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Merge Request Tabs Header is missing bottom border" Closes #57160 See merge request gitlab-org/gitlab-ce!25198
| * | | | Return border bottom on MR TabsSam Bigelow2019-02-131-5/+3
| | | | |
* | | | | Merge branch 'diff-fix-duplicate-key-error' into 'master'Filipa Lacerda2019-02-132-0/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Fixed diff rendering causing a duplicate key warning Closes #56797 See merge request gitlab-org/gitlab-ce!24634
| * | | | Fixed diff rendering causing a duplicate key warningPhil Hughes2019-02-132-0/+2
| |/ / / | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56797
* | | | add title attr to display file nameSatoshi Nakamatsu2019-02-131-0/+1
| | | |
* | | | Support `only: changes:` on MR pipelinesHiroyuki Sato2019-02-131-1/+10
| | | |
* | | | Add support for FTP assets for releasesRobert Schilling2019-02-131-1/+1
|/ / / | | | | | | | | | Extend the list of supported protocols to include FTP.
* | | Find checkbox input with less specific selectorBrett Walker2019-02-121-1/+1
| | |
* | | Merge branch ↵Lin Jen-Shin2019-02-121-2/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '57426-review-apps-some-merge-related-tests-fail-in-review-qa-jobs-but-not-in-package-and-qa' into 'master' Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineService Closes #57426 See merge request gitlab-org/gitlab-ce!25168
| * | | Fix a Ruby 2.4 incompatibility in Ci::CreatePipelineServiceRémy Coutable2019-02-121-2/+7
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Replace useless divs with flex layout in navbarjoola2019-02-123-9/+6
| | | | | | | | | | | | | | | | Notable changes proposed by @pslaughter
* | | | Merge branch 'fix-broken-links-in-help' into 'master'Rémy Coutable2019-02-121-3/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix broken links on help page Closes #57554 See merge request gitlab-org/gitlab-ce!25120
| * | | Update RE used to prefix links with /help/Frank Sauerburger2019-02-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Update the regular expression in the help controller used to prefix relative links on the help page with /help/. As suggested by @rymai, the look-ahead pattern to detect external links is simplified from `[a-zA-Z0-9.+-]` to `\w`.
| * | | Fix broken links on help pageFrank Sauerburger2019-02-111-3/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the help controller to correctly handle relative links on the help pages when the relative link is before an external link on the same line in the markdown file. Test cases have been implement to check for - relative links before external link on same line, - HTTPS in query part of link, - URLs without '//' and - protocol-relative links.
* | | Merge branch 'sh-log-rails-queue-duration' into 'master'James Lopez2019-02-121-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Log queue duration in production_json.log Closes #57420 See merge request gitlab-org/gitlab-ce!25075
| * | | Log queue duration in production_json.logStan Hu2019-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `queue_duration` is a useful metric that is currently in api_json.log but not in production_json.log. We should add it because it tells us how long the request sat in Workhorse before Unicorn processed it. Having this field enables the support team to better troubleshoot when delays began to happen.
* | | | Change unicode for non-standard spacesMarcel Amirault2019-02-121-1/+1
| | | |
* | | | Merge branch 'remove-fast-destroy-flag' into 'master'Douglas Barbosa Alexandre2019-02-121-30/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove fast_destroy_uploads feature flag Closes #54937 See merge request gitlab-org/gitlab-ce!24930
| * | | | Remove fast_destroy_uploads feature flagJan Provaznik2019-02-121-30/+4
| |/ / / | | | | | | | | | | | | Fast destroy of uploads was successfully enabled and test.
* | | | Transforming Gfm also on paste so it works also in FFTim Zallmann2019-02-121-5/+29
|/ / /
* | | Merge branch '57551-collapse-board-list-fix' into 'master'Phil Hughes2019-02-122-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add flex styles to board list only if board list is expanded Closes #57551 See merge request gitlab-org/gitlab-ce!25113
| * | | Add flex styles to board list only if board list is expandedAnnabel Dunstone Gray2019-02-112-1/+8
| | | |
* | | | Merge branch '57564-contributing-button-border' into 'master'Filipa Lacerda2019-02-121-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the border style of CONTRIBUTING button when it exists Closes #57564 See merge request gitlab-org/gitlab-ce!25124
| * | | | Fix the border style of CONTRIBUTING button when it existsTakuya Noguchi2019-02-121-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | Fix access to pages domain settingsVladimir Shushlin2019-02-121-1/+1
| | | | |
* | | | | Merge branch '55209-tool-tip-hides-menu-item' into 'master'Phil Hughes2019-02-121-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tool Tip Hides Menu Item" Closes #55209 See merge request gitlab-org/gitlab-ce!24285
| * | | | | Hide More Actions tooltip when the menu opens55209-tool-tip-hides-menu-itemSimon Knox2019-02-121-0/+6
| | | | | |
* | | | | | Merge branch 'add-client-for-count-diverging-commits' into 'master'Grzegorz Bizon2019-02-124-16/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | add client support for CountDivergingCommits rpc See merge request gitlab-org/gitlab-ce!24287
| * | | | | | Adapt that diverging commits could be just one baradd-client-for-count-diverging-commitsLin Jen-Shin2019-02-113-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactors the ui for diverging commits so that it's only a single bar instead of two separate bars
| * | | | | | Add client support for count diverging commitsJohn Cai2019-02-061-3/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the client call for the gitaly rpc CountDivergingCommits fixing signature simplifying commit logic adding test for max-count refactoring tests
* | | | | | Merge branch 'jc-add-has-repository' into 'master'Douglas Barbosa Alexandre2019-02-121-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding convenience method to project model See merge request gitlab-org/gitlab-ce!25108
| * | | | | | Adding convenience method to project modelJohn Cai2019-02-111-0/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'bw-review-feedback-task-list-toggle-service' into 'master'Robert Speicher2019-02-111-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Address review comment for app/services/task_list_toggle_service.rb Closes #57413 See merge request gitlab-org/gitlab-ce!25013
| * | | | | Optimize the compare of the task linesbw-review-feedback-task-list-toggle-serviceBrett Walker2019-02-081-1/+1
| | | | | |
* | | | | | Merge branch '52424-goodbye-hipchat' into 'master'Douglas Barbosa Alexandre2019-02-113-313/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove HipChat integration from GitLab Closes #52424 See merge request gitlab-org/gitlab-ce!22223
| * | | | | Remove HipChat integration from GitLabNick Thomas2019-02-083-313/+0
| | | | | |
* | | | | | Merge branch 'fix_deployment_service_predefined_variables' into 'master'Nick Thomas2019-02-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing argument to DeploymentService#predefined_variables See merge request gitlab-org/gitlab-ce!24989
| * | | | | | Add missing argument to DeploymentService#predefined_variablesfix_deployment_service_predefined_variablesJames Fargher2019-02-081-1/+1
| | |_|/ / / | |/| | | |