summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-292-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the git default and will help to prevent false positive matches. Closes #12706
| * | | | | | | | | | Merge branch 'cache-broadcast-message-current' into 'master' Dmitriy Zaporozhets2016-01-301-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache BroadcastMessage.current. Fixes #12770 See merge request !2633
| | * | | | | | | | | | Change ttl to 1 minutecache-broadcast-message-currentJosh Frye2016-01-291-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Cache BroadcastMessage.current for 5 minutes. Fixes #12770Josh Frye2016-01-291-1/+3
| | |/ / / / / / / / /
| * | | | | | | | | | Merge remote-tracking branch 'origin/background-delete-process'Dmitriy Zaporozhets2016-01-306-4/+32
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | First pass at deleting projects in the background.Josh Frye2016-01-296-4/+32
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'warn-admin-oauth' into 'master' Douwe Maan2016-01-301-1/+10
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn admin of granting admin rights during OAuth Fixes #3951 Warning style the same as the warning a user sees on a archived project. ![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png) See merge request !2601
| | * | | | | | | | | Improve text on warning messageZeger-Jan van de Weg2016-01-261-1/+3
| | | | | | | | | | |
| | * | | | | | | | | Warn admin of granting admin rights during OAuthZeger-Jan van de Weg2016-01-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3951 Warning style the same as the warning a user sees on a archived project.
| * | | | | | | | | | Fix old version warning when viewing wiki latest version via version_idfix-viewing-wiki-page-lastest-version-via-version-idDouglas Barbosa Alexandre2016-01-291-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'focus-emoji-search-field' into 'master' Jacob Schatz2016-01-292-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-focus emoji award search field ![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif) Closes #12621 cc. @jschatz1 See merge request !2650
| | * | | | | | | | | Auto-focus emoji award search fieldPhil Hughes2016-01-292-1/+2
| | | |_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #12621
| * | | | | | | | | Merge branch 'note-background-job' into 'master' Dmitriy Zaporozhets2016-01-294-18/+45
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-18/+45
| | | | | | | | | |
| * | | | | | | | | Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-294-25/+0
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert "Add IP check against DNSBLs at account sign-up" This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact. See merge request !2643
| | * | | | | | | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-284-25/+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 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-292-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix syntax error on 2.1 and rubocop on 2.2 Background: Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`. Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12801 See merge request !2637
| | * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2825-29/+194
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | hotfix/ruby-21-broken-update
| | * | | | | | | | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-282-2/+2
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-285-21/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2821-36/+39
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Fix specsDouwe Maan2016-01-283-3/+6
| | | | | | | | | | |
| | * | | | | | | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-274-20/+18
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-29/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-2821-36/+39
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Move blame group logic to dedicated classDouwe Maan2016-01-282-29/+3
| | | | | | | | | | | |
| | * | | | | | | | | | Fix highlighting in blame view.Douwe Maan2016-01-272-4/+6
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | 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-2813-18/+159
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| | * | | | | | | | | Align filter dropdown.issue_2406Rubén Dávila2016-01-271-0/+4
| | | | | | | | | | |
| | * | | | | | | | | Remove no longer required CSS rule.Rubén Dávila2016-01-201-4/+0
| | | | | | | | | | |
| | * | | | | | | | | Refactor some CSS rules.Rubén Dávila2016-01-202-6/+17
| | | | | | | | | | |
| | * | | | | | | | | Some fixes from last code review.Rubén Dávila2016-01-204-5/+5
| | | | | | | | | | |
| | * | | | | | | | | Some CSS and sorting fixes.Rubén Dávila2016-01-203-19/+30
| | | | | | | | | | |
| | * | | | | | | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-203-2/+16
| | | | | | | | | | |
| | * | | | | | | | | Add ability to sort forks. #2406Rubén Dávila2016-01-202-4/+7
| | | | | | | | | | |
| | * | | | | | | | | aligns menu at top on one rowJacob Schatz2016-01-202-10/+26
| | | | | | | | | | |
| | * | | | | | | | | changing projects cssJacob Schatz2016-01-201-1/+0
| | | | | | | | | | |
| | * | | | | | | | | WIP: Add sort dropdown. #2406Rubén Dávila2016-01-201-0/+20
| | | | | | | | | | |
| | * | | | | | | | | Little update to copy and custom content for empty results. #2406Rubén Dávila2016-01-201-8/+13
| | | | | | | | | | |
| | * | | | | | | | | Show last commit as description. #2406Rubén Dávila2016-01-203-4/+10
| | | | | | | | | | |
| | * | | | | | | | | Fix broken specs. #2406Rubén Dávila2016-01-201-4/+2
| | | | | | | | | | |
| | * | | | | | | | | Add ability to filter by namespace. #2406Rubén Dávila2016-01-202-12/+20
| | | | | | | | | | |
| | * | | | | | | | | Use adequate icon for Forks link on sidebar. #2406Rubén Dávila2016-01-201-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Show forks counter on listing. #2406Rubén Dávila2016-01-203-2/+10
| | | | | | | | | | |
| | * | | | | | | | | Add fork button and implement ability to distinguish between public and ↵Rubén Dávila2016-01-202-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protected forks. #2406
| | * | | | | | | | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-205-4/+12
| | | | | | | | | | |
| | * | | | | | | | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-208-9/+19
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-282-2/+23
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537
View Lorry Controller Status