summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Removed benchmark suite and its documentationremove-benchmark-suiteYorick Peterse2016-03-1014-476/+3
| | | | | | | | | The rationale for this can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/13718 but in short the benchmark suite no longer serves a good purpose now that we have proper production monitoring in place. Fixes gitlab-org/gitlab-ce#13718
* 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
| |/ / / / /
* | | | | | Merge branch 'update-db-schema' into 'master' Yorick Peterse2016-03-091-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | See merge request !3136
| * | | | | | Added main_language to the schemaYorick Peterse2016-03-091-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | This wasn't included in gitlab-org/gitlab-ce!3000.
* | | | | | Merge branch 'fix/upgrader-docs' into 'master' Achilleas Pipinellis2016-03-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix master branch link to upgrader.md See merge request !2967
| * | | | | | Fix URL to upgrader guideJonas Friedmann2016-03-091-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-0921-69/+42
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rs-traits-are-good' into 'master' Dmitriy Zaporozhets2016-03-098-36/+32
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make better use of the `visibility_level` factory traits See merge request !3131
| | * | | | | | | Make better use of the `visibility_level` factory traitsrs-traits-are-goodRobert Speicher2016-03-085-20/+19
| | | | | | | | |
| | * | | | | | | Simplify the various Snippet factoriesRobert Speicher2016-03-083-16/+13
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-0913-33/+10
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove `Snippet#expires_at` This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years. See merge request !3103
| | * | | | | | | Remove `Snippet#expires_at`rs-snippets-dont-expireRobert Speicher2016-03-0513-33/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was removed from the interface in https://github.com/gitlabhq/gitlabhq/pull/6027 but its implementation lingered around for two years.
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-03-092-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'security_bug_fix_close_issue' into 'master' Douwe Maan2016-03-052-2/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Security] Automatic issue closing Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2640 See merge request !1944
| | * | | | | | | | Security: Fix issue auto closingValery Sizov2016-03-032-2/+6
| | | | | | | | | |
View Lorry Controller Status