summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0118-75/+118
|\
| * First pass at deleting projects in the background.Josh Frye2016-01-291-2/+6
| |
| * Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Background process note logic for #3948 Quick and dirty way to get *most* of the note processing out of band and into the background. Seeing some pretty nice speed bumps. Keep in mind that doing this in process results in slower and slower responses as more notes are added and more participants exist. ``` without background processing Completed 200 OK in 627ms (Views: 0.5ms | ActiveRecord: 32.3ms) Completed 200 OK in 478ms (Views: 0.8ms | ActiveRecord: 28.3ms) Completed 200 OK in 1107ms (Views: 0.6ms | ActiveRecord: 36.6ms) with background processing Completed 200 OK in 108ms (Views: 0.6ms | ActiveRecord: 4.7ms) Completed 200 OK in 78ms (Views: 0.5ms | ActiveRecord: 4.5ms) Completed 200 OK in 164ms (Views: 0.5ms | ActiveRecord: 8.3ms) ``` As you can see, speeds are consistent when doing the harder work out of process. I'm not sure the number of sql queries we're saving, but based on the logs alone it's a pretty good amount. @dzaporozhets @yorickpeterse I would love some input on this. See merge request !2631
| | * [WIP] Background process note logic for #3948Josh Frye2016-01-281-1/+1
| | |
| * | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-282-7/+0
| | | | | | | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
| * | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-281-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| | * \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-285-11/+10
| | |\ \
| | * | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-271-1/+1
| | | | |
| * | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-23/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| | * \ \ \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-11/+10
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Move blame group logic to dedicated classDouwe Maan2016-01-281-27/+1
| | | | | |
| | * | | | Fix highlighting in blame view.Douwe Maan2016-01-271-0/+4
| | | |/ / | | |/| |
| * | | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Backport LDAP user assignment changes from EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
| | * | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | | |/ | | |/| | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
| * | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-1/+10
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| | * | | Some CSS and sorting fixes.Rubén Dávila2016-01-201-2/+2
| | | | |
| | * | | Add ability to sort forks. #2406Rubén Dávila2016-01-201-0/+2
| | | | |
| | * | | Add fork button and implement ability to distinguish between public and ↵Rubén Dávila2016-01-201-1/+4
| | | | | | | | | | | | | | | | | | | | protected forks. #2406
| | * | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-201-1/+2
| | | | |
| | * | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-201-0/+3
| | | | |
| * | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-281-1/+22
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537
| | * | | Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-221-4/+2
| | | | |
| | * | | Merge branch 'master' into issue_5546Rubén Dávila2016-01-227-19/+27
| | |\ \ \
| | * | | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-221-6/+15
| | | | | |
| | * | | | Make cookie suffix more simpler.Rubén Dávila2016-01-211-2/+2
| | | | | |
| | * | | | Little refactor plus some specs.Rubén Dávila2016-01-211-12/+6
| | | | | |
| | * | | | Remember last sort option used.Rubén Dávila2016-01-201-1/+21
| | | | | |
| * | | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-273-9/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of retrieving last update times for events See 75195eefcca4cb3961986c90c8e837da02f30134 and https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317 for the juicy details. Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12415 See merge request !2613
| | * | | | | Don't pluck project IDs for eventsYorick Peterse2016-01-263-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By instead using a sub-query we save ourselves the overhead of loading any data into memory only to pass it on to another query.
| * | | | | | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-271-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the 2FA requirement during logout See merge request !2581
| | * | | | | | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-271-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return a 404 instead of a 500 when accessing a non-existent group Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3352 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5600 See merge request !2614
| | * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-271-4/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | fix/unexistent-group-500
| | * | | | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| | | | | | | |
| | * | | | | | fix for failing specJames Lopez2016-01-261-1/+2
| | | | | | | |
| | * | | | | | feature and fix for 500 on group missingJames Lopez2016-01-261-0/+1
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-2/+2
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582
| | * | | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-2/+2
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-4/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580
| | * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
| * | | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
| |/ / /
| * | | Merge branch 'fix-comment-on-diff-ajax-loading'Dmitriy Zaporozhets2016-01-221-12/+10
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable2016-01-203-0/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | fix-comment-on-diff-ajax-loading
| | * | | Fix diff comments loaded by AJAX to load comment with diff in discussion tabRémy Coutable2016-01-191-12/+10
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | This commits also fixes two minor issues: - Ensure notes that the current user is not allowed to see are not returned in the AJAX notes loading - Ensure the notes counter badge is decremented of 1 instead of 2
| * | | Merge branch 'fix-mr-diff-edit-button' into 'master' Robert Speicher2016-01-221-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix MR diff 'Edit' button It now works and has the right size. See merge request !2542
| | * | | Fix MR diff 'Edit' buttonfix-mr-diff-edit-buttonDouwe Maan2016-01-211-1/+1
| | | | |
| * | | | Make sure non-highlighted diffs are still escapedunescaped-diffsDouwe Maan2016-01-221-1/+3
| |/ / /
| * | | Merge branch 'master' into issue_3945issue_3945Rubén Dávila2016-01-202-0/+7
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'feature/check-against-rbl-only' into 'master'Robert Speicher2016-01-202-0/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split from !2455 References #9092 See merge request !2515
| | | * | Add IP blocking against DNSBL at sign-upfeature/check-against-rbl-onlyTomasz Maczukin2016-01-202-0/+7
| | | |/
View Lorry Controller Status