summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Allow filtered dashboard/explore results to be paged. Fixes #14104fix-filtered-paginationJosh Frye2016-03-092-5/+5
|
* Merge branch 'master' into markdown_preview_shortcutBaldinof2016-03-0983-718/+658
|\
| * Merge branch 'fix-git-push-service-specs' into 'master' Robert Speicher2016-03-091-0/+5
| |\ | | | | | | | | | | | | Fixed the GitPushService specs See merge request !3139
| | * Handle permissions for ExternalIssue instancesfix-git-push-service-specsYorick Peterse2016-03-091-0/+5
| | | | | | | | | | | | This fixes the remainder of the GitPushService specs.
| * | Merge branch 'fix-todos' into 'master' Douglas Barbosa Alexandre2016-03-093-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 in Todos Closes #14095 Closes #14075 Closes #14109 Closes #14151 See merge request !3141
| | * | Avoid error 500 when todo author was removedDouglas Barbosa Alexandre2016-03-092-2/+5
| | | |
| | * | Destroy all related todos when removing a projectDouglas Barbosa Alexandre2016-03-091-0/+1
| | |/
| * | 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 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-095-24/+3
| |\ \ \
| | * \ \ Merge branch 'rs-snippets-dont-expire' into 'master' Dmitriy Zaporozhets2016-03-095-24/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-055-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
| * | | | | | Merge branch 'improve-archived-projects'Dmitriy Zaporozhets2016-03-0912-68/+82
| |\ \ \ \ \ \
| | * | | | | | Updated project list dropdown to use dropdown classesimprove-archived-projectsPhil Hughes2016-03-052-32/+11
| | | | | | | |
| | * | | | | | Align projects sort checkboxDmitriy Zaporozhets2016-03-042-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Show active sorting method for projects listDmitriy Zaporozhets2016-03-042-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Add projects list sort dropdown to group pageDmitriy Zaporozhets2016-03-042-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Make projects sort dropdown shared so it can be reused for other pagesDmitriy Zaporozhets2016-03-044-23/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | | | Add option to show archived projects on dahsboardDmitriy Zaporozhets2016-03-044-22/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | Merge branch 'branch-tag-count-methods' into 'master' Robert Speicher2016-03-084-11/+46
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use dedicated methods for counting branches and tags This started out as "Lets add two methods to count and cache some data" and ended up in a clean-up/fix of some existing code. The two problems were: 1. Different code was used for adding/removing branches/tags via Git and the UI 2. The code used for the UI didn't have any RSpec tests, and I couldn't find any Spinach tests either (though grepping for Spinach stuff is hard) This MR addresses the following: 1. `Repository#branch_count` and `Repository#tag_count` are used to count and cache the number of branches/tags, these methods are then used on the branches/commits/tags pages. 2. `Repository#add_tag`, `Repository#add_branch`, `Repository#rm_tag` and `Repository#rm_branch` now all the appropriate before/after hook methods instead of calling a random single cache expiration method. This ensures caches are properly flushed when adding/removing tags/branches via the UI. 3. RSpec tests were added for the above methods. This fixes gitlab-org/gitlab-ce#13459 See merge request !3128
| | * | | | | | | Call after_create_branch in Repository#add_branchbranch-tag-count-methodsYorick Peterse2016-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures the right caches are flushed when adding a branch via the UI, instead of only flushing this one random cache.
| | * | | | | | | Call the right hooks in Repository#add_tagYorick Peterse2016-03-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures Repository#add_tag calls Repository#before_push_tag instead of just 1 random cache expiration method.
| | * | | | | | | Call the right hooks when removing branchesYorick Peterse2016-03-081-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that Repository#rm_branch calls before_remove_branch/after_remove_branch instead of just 1 random cache expiration method.
| | * | | | | | | Cache & flush tag/branch countsYorick Peterse2016-03-084-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The methods used for this are Repository#tag_count and Repository#branch_count which cache their output in Redis as well as memoizing it in an instance variable. Both methods have a corresponding methods/hooks to flush the caches at the right time.
| * | | | | | | | Remove instance variable @group multiple assignmentYatish Mehta2016-03-081-1/+1
| |/ / / / / / /
| * | | | | | | Merge branch 'master' into 'master' Yorick Peterse2016-03-083-0/+23
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | adds language names to projects list [image attached] See merge request !3000
| | * | | | | | adds test for git push service for updating the language of the projecttiagonbotelho2016-03-071-3/+5
| | | | | | | |
| | * | | | | | moves the main_language update logic to git push servicetiagonbotelho2016-03-072-8/+12
| | | | | | | |
| | * | | | | | removes automatic setting of main_language to project for it to set a main ↵tiagonbotelho2016-03-071-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language you have now to make a commit to the project
| | * | | | | | fixes typotiagonbotelho2016-03-071-1/+1
| | | | | | | |
| | * | | | | | removes redundant selftiagonbotelho2016-03-071-1/+1
| | | | | | | |
| | * | | | | | adds tests and fixes some broken code to main language mrtiagonbotelho2016-03-071-3/+3
| | | | | | | |
| | * | | | | | adds swp and swo to gitignore and improves migration for project main_languagetiagonbotelho2016-03-073-6/+18
| | | | | | | |
| | * | | | | | removes unused methods that I forgottiagonbotelho2016-03-072-16/+0
| | | | | | | |
| | * | | | | | implements project languages saving them onto the databasetiagonbotelho2016-03-072-0/+12
| | | | | | | |
| | * | | | | | moves method to repository modeltiagonbotelho2016-03-072-7/+13
| | | | | | | |
| | * | | | | | changes if ! to unless and now asks for language instead of languagestiagonbotelho2016-03-071-3/+4
| | | | | | | |
| | * | | | | | adds cache to languages listtiagonbotelho2016-03-071-4/+4
| | | | | | | |
| | * | | | | | adds language names to projects list github styletiagonbotelho2016-03-072-0/+12
| | | | | | | |
View Lorry Controller Status