summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'optimize-project-ci-services' into 'master' Douwe Maan2016-03-101-2/+2
|\ | | | | | | | | | | | | Optimize Project#ci_service(s) Related issue: gitlab-org/gitlab-ce#14186 See merge request !3158
| * Optimize Project#ci_service(s)optimize-project-ci-servicesYorick Peterse2016-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method Project#ci_services would load all services into memory (including _all_ their columns) and then use Enumerable#select to reduce the list. Project#ci_service in turn would further reduce this list down to just 1 Service instance. Instead of doing all this in Ruby we can just offload the work to the database, reducing the amount of time spent in these methods. These changes reduce the time of the first call to Project#ci_services from around 240 ms to around 10 ms, though the final timings will vary based on database load. Because Project#ci_service is memoized there's no further overhead introduced by using a database query. Fixes gitlab-org/gitlab-ce#14186
* | Merge branch 'quick-submit-note-edit' into 'master' Jacob Schatz2016-03-102-13/+20
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed quick submit on note edit Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there Closes #14094 See merge request !3151
| * | Fixed quick submit on note editquick-submit-note-editPhil Hughes2016-03-102-13/+20
| |/ | | | | | | | | | | Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there Closes #14094
* | Merge branch 'copy-markdown-snippet' into 'master' Jacob Schatz2016-03-102-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with markdown snippet not being copyable On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied Closes #13882 See merge request !3153
| * | Replaced hidden div for textarea off-the screenPhil Hughes2016-03-102-1/+9
| | | | | | | | | | | | Element with the content being copied cant be hidden so instead i\'ve moved it off the screen
| * | Fixes issue with markdown snippet not being copyablePhil Hughes2016-03-101-0/+2
| |/ | | | | | | | | | | On markdown snippets this adds a hidden div with the raw markdown content so that it can be copied Closes #13882
* | Merge branch 'enhanced-dropdow-css' into 'master' Jacob Schatz2016-03-103-2/+408
|\ \ | | | | | | | | | | | | | | | | | | New dropdown UI See #3279 for the designs See merge request !3110
| * | Dropdown toggle button stylingenhanced-dropdow-cssPhil Hughes2016-03-103-16/+64
| | |
| * | Dropdown variablesPhil Hughes2016-03-103-7/+12
| | |
| * | Added CSS for new dropdownsPhil Hughes2016-03-102-0/+353
| |/ | | | | | | See #3279 for the designs
* | Merge branch 'fix-projects-ajax-pagination' into 'master' Jacob Schatz2016-03-101-0/+6
|\ \ | |/ |/| | | | | | | | | | | | | Fix projects pagination via ajax Basically was not implemented. Finishes our projects list refactoring. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !3155
| * Use modern syntaxDmitriy Zaporozhets2016-03-101-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Fix projects pagination via ajaxDmitriy Zaporozhets2016-03-101-0/+6
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'issue-referenced-merge-requests-specs' into 'master' Robert Speicher2016-03-101-0/+25
|\ | | | | | | | | | | | | Added specs for Issue#referenced_merge_requests Added these while looking into https://gitlab.com/gitlab-org/gitlab-ce/issues/13651. See merge request !3125
| * Added specs for Issue#referenced_merge_requestsYorick Peterse2016-03-091-0/+25
|/
* Merge branch 'markdown_preview_shortcut' into 'master' Jacob Schatz2016-03-104-7/+63
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add shortcut to toggle markdown preview Allow to toggle markdown preview with shortcut `ctrl+shift+p` (`cmd+shift+p` on OSX). - If the user is focused on a md textarea, `ctrl-shift-p` will show the preview, otherwise native browser event is fired - The textarea is re-focused after disabling the preview tab - Results of markdown render is cached for fast toggles I'm on linux, so if someone can test it on OS X, it would be great! Closes #14038 See merge request !3111
| * Merge branch 'master' into markdown_preview_shortcutBaldinof2016-03-09178-1471/+2006
| |\ | |/ |/|
* | Merge branch 'retry-bundle' into 'master' Kamil Trzciński2016-03-092-13/+15
|\ \ | | | | | | | | | | | | | | | | | | Retry bundler and apt-get See merge request !3146
| * | Retry bundler and apt-getretry-bundleKamil Trzcinski2016-03-092-13/+15
| | |
* | | Merge branch 'fix-git-push-service-specs' into 'master' Robert Speicher2016-03-092-7/+13
|\ \ \ | |/ / |/| | | | | | | | Fixed the GitPushService specs See merge request !3139
| * | Handle permissions for ExternalIssue instancesfix-git-push-service-specsYorick Peterse2016-03-092-2/+7
| | | | | | | | | | | | This fixes the remainder of the GitPushService specs.
| * | Fixed part of the GitPushService specsYorick Peterse2016-03-091-5/+6
| | | | | | | | | | | | | | | | | | These were broken by commit 21a05328ffd5cb9130ae516faa7dd672cacba90c. Two JIRA tests remain broken but I can't quite figure out how to fix them.
* | | Merge branch 'rs-sprite-task' into 'master' Dmitriy Zaporozhets2016-03-091-0/+121
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `gemojione:sprite` Rake task This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. See merge request !3130
| * | | Add a `gemojione:sprite` Rake taskRobert Speicher2016-03-091-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This task will generate a standard and Retina sprite of all of the current Gemojione Emojis, with the accompanying SCSS map. It will not appear in `rake -T` output, and the dependent gems are not included in the Gemfile by default, because this task will only be needed occasionally. [ci skip]
* | | | Merge branch 'fix-todos' into 'master' Douglas Barbosa Alexandre2016-03-097-3/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
| * | | | Update CHANGELOGDouglas Barbosa Alexandre2016-03-091-1/+2
| | | | |
| * | | | Avoid error 500 when todo author was removedDouglas Barbosa Alexandre2016-03-092-2/+5
| | | | |
| * | | | Update CHANGELOGDouglas Barbosa Alexandre2016-03-091-0/+3
| | | | |
| * | | | Remove invalid todos from databaseDouglas Barbosa Alexandre2016-03-092-1/+17
| | | | |
| * | | | Destroy all related todos when removing a projectDouglas Barbosa Alexandre2016-03-092-0/+2
| | | | |
* | | | | Merge branch 'snippet-visibility-spacing' into 'master' Jacob Schatz2016-03-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snippet visibility badge spacing Closes #14074 ![Screen_Shot_2016-03-08_at_08.40.32](/uploads/f55ca724fbf0e247b299a2702c3b55f5/Screen_Shot_2016-03-08_at_08.40.32.png) See merge request !3122
| * | | | | Snippet visibility badge spacingsnippet-visibility-spacingPhil Hughes2016-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Closes #14074
* | | | | | Merge branch 'commit-limits' into 'master' Jacob Vosmaer2016-03-094-6/+26
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit limits Prevent timeouts when creating/viewing Merge Requests with many commits. Also, reduce the number of commits shown in the UI from 500 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14031 This MR avoids Unicorn timeouts in some places and takes 4.5 seconds off load times in others, when manually testing with a 4500-commit compare/MR in the linux repo. It does not limit the number of Commit objects instantiated in memory, just the amount of HTML generated. It seems that having 4500 commits objects is not a problem in itself. If it ever becomes one we could do something for Commit objects like we did for Diff (introduce a CommitCollection or something). See merge request !3095
| * | | | | | Prevent performance issuescommit-limitsJacob Vosmaer2016-03-092-2/+2
| | | | | | |
| * | | | | | Change "some commits hidden" messageJacob Vosmaer2016-03-072-2/+2
| | | | | | |
| * | | | | | Finish refactorJacob Vosmaer2016-03-071-1/+1
| | | | | | |
| * | | | | | Remove outdated commentJacob Vosmaer2016-03-041-1/+0
| | | | | | |
| * | | | | | Put 'hidden commits' logic in CommitsHelperJacob Vosmaer2016-03-043-12/+23
| | | | | | |
| * | | | | | Limit the number of commits shown in MRsJacob Vosmaer2016-03-041-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents timeouts when creating a MR with 1000s of commits.
| * | | | | | Show at most 100 commits in the web UIJacob Vosmaer2016-03-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering 1 commit takes over 5ms (on my laptop: around 9ms), it saves seconds in rendering time to show 100 instead of 500 commits.
* | | | | | | Merge branch 'rs-bump-poltergeist' into 'master' Dmitriy Zaporozhets2016-03-092-3/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump poltergeist to `~> 1.9.0` See merge request !3116
| * | | | | | Bump poltergeist to `~> 1.9.0`rs-bump-poltergeistRobert Speicher2016-03-072-3/+3
| | | | | | |
* | | | | | | Merge branch 'retry-tests' into 'master' Kamil Trzciński2016-03-098-36/+83
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Retry failed tests This is to make the CI builds more reliable due to large amount of timeouts and deadlocks recently. See merge request !1793
| * | | | | | Fix script errorKamil Trzcinski2016-03-091-1/+1
| | | | | | |
| * | | | | | Retry apt-get installation and bundle installKamil Trzcinski2016-03-092-8/+20
| | | | | | |
| * | | | | | Retry spinach testsKamil Trzcinski2016-03-095-28/+53
| | | | | | |
| * | | | | | Retry failed testsKamil Trzcinski2016-03-094-0/+10
|/ / / / / /
* | | | | | Merge branch 'iurisilvio/gitlab-ce-bitbucket_closed' into 'master' Rémy Coutable2016-03-093-1/+90
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Bitbucket 'closed' issues were imported as 'opened' _Originally opened at !2930 by @iurisilvio._ - - - Bitbucket has an undocumented status `closed`. https://confluence.atlassian.com/bitbucket/issues-resource-296095191.html Related to https://gitlab.com/gitlab-com/support-forum/issues/559 See merge request !2973
| * | | | | | Fix bug where Bitbucket `closed` issues were imported as `opened`iurisilvio/gitlab-ce-bitbucket_closedIuri de Silvio2016-03-073-1/+90
| |/ / / / /
View Lorry Controller Status