summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-0/+4
| | | | Closes #11853
* Merge branch 'fix-double-page' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ | | | | | | | | | | | | | | | | | | Fix double paging ![Screen_Shot_2016-02-05_at_10.27.34_AM](/uploads/a21ad6c47ddecad29d377497ee2a167d/Screen_Shot_2016-02-05_at_10.27.34_AM.png) ![Screen_Shot_2016-02-05_at_10.27.44_AM](/uploads/3badb423df25f009886138c65cfe8347/Screen_Shot_2016-02-05_at_10.27.44_AM.png) See merge request !2727
| * Fix double pagingJosh Frye2016-02-051-1/+1
| |
* | Merge branch 'improve-broadcast-messages' into 'master' Dmitriy Zaporozhets2016-02-051-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Improve admin broadcast messages page * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #13211 cc @rspeicher @DouweM See merge request !2725
| * Improve admin broadcast messages pageDmitriy Zaporozhets2016-02-051-1/+1
| | | | | | | | | | | | | | * Show latest broadcast messages first on admin page * Use nice looking pagination Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Implement changes from MR feedbackJosh Frye2016-02-041-6/+6
| |
* | Various filter fixesJosh Frye2016-02-045-12/+22
| |
* | Paginate + ajax filter dashboard projectsJosh Frye2016-02-043-8/+21
| |
* | Page project list on dashboardJosh Frye2016-02-041-0/+2
|/
* Merge branch 'rs-backport-ldap-2fa' into 'master' Dmitriy Zaporozhets2016-02-041-2/+7
|\ | | | | | | | | | | | | Support Two-factor Authentication for LDAP users Closes #12653 See merge request !2688
| * Support Two-factor Authentication for LDAP usersrs-backport-ldap-2faRobert Speicher2016-02-031-2/+7
| | | | | | | | Closes #12653
* | Add sort dropdown to dashboard projects pagedashboard-sort-dropdownDmitriy Zaporozhets2016-02-031-0/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Support download access by PRIVATE-TOKEN headerStan Hu2016-02-031-0/+2
| | | | | | | | | Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137
* Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-032-0/+19
|\ | | | | | | | | | | | | | | | | | | Support Akismet spam checking for creation of issues via API Currently any spam detected by Akismet for non-members via API will be logged in a separate table in the admin page. Closes #5612 See merge request !2266
| * Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-021-23/+7
| |
| * Support Akismet spam checking for creation of issues via APIStan Hu2016-02-022-0/+35
| | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612
* | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-022-18/+9
|\ \ | | | | | | | | | | | | | | | | | | Send raw Git blobs via gitlab-workhorse See merge request !2451
| * | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| | |
| * | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4
| | |
| * | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-0123-80/+126
| |\ \ | | |/ | | | | | | git-raw-workhorse
| * | Use only one header to send git blobsJacob Vosmaer2016-02-012-4/+2
| | |
| * | No need for base64 anymoreJacob Vosmaer2016-01-281-2/+0
| | |
| * | Send more raw blob data with workhorseJacob Vosmaer2016-01-282-8/+7
| | |
| * | Prototype of Git blobs via workhorseJacob Vosmaer2016-01-151-11/+6
| | |
* | | 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
| | | | | | |
View Lorry Controller Status