summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'improve-issues-filter-all-spec' into 'master' Dmitriy Zaporozhets2016-03-141-1/+1
|\ | | | | | | | | | | | | Use Capybara find methods and remove sleeps in feature specs in "All Issues" filter Fixes sporadic build failures (e.g. https://gitlab.com/gitlab-org/gitlab-ce/builds/856233) See merge request !3198
| * Use Capybara find methods and remove sleeps in feature specs in "All Issues" ↵improve-issues-filter-all-specStan Hu2016-03-131-1/+1
| | | | | | | | filter
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-143-21/+17
|\ \
| * | Fix denting and specZeger-Jan van de Weg2016-03-131-1/+1
| | |
| * | ContinueToParams -> ContinueParamsZeger-Jan van de Weg2016-03-133-4/+4
| | |
| * | Check redirect path in the continue_paramsZeger-Jan van de Weg2016-03-133-21/+17
| | | | | | | | | | | | | | | | | | Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2649 https://gitlab.com/gitlab-org/gitlab-ce/issues/13956
* | | Merge branch 'upcoming' into 'master' Douwe Maan2016-03-133-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements upcoming filter in milstones ![Imgur](http://i.imgur.com/Oc2LZrF.png) @DouweM @JobV I think this is what you wanted :) Lemme know if it there is something that need changing Had alot of fun doing it! Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14102 See merge request !3148
| * | | fixes small issuestiagonbotelho2016-03-131-2/+2
| | | |
| * | | fixes issuestiagonbotelho2016-03-122-5/+4
| | | |
| * | | fixes issues for mr acceptancetiagonbotelho2016-03-122-8/+12
| | | |
| * | | implements upcoming filter in milstonestiagonbotelho2016-03-123-0/+10
| | |/ | |/|
* | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-122-16/+0
|/ / | | | | This reverts commit 5a586f364c5d2b866d6a074eff7996f05585b7d5
* | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-122-0/+16
| | | | | | This reverts merge request !3191
* | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-122-16/+0
|\ \ | |/ |/| | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| * Remove existing go_import.html.haml implementationStan Hu2016-03-122-16/+0
| |
* | Merge branch 'projects-finder-ee-compatible' into 'master' Dmitriy Zaporozhets2016-03-122-7/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Removed User#project_relations This is to make things more compatible with EE so merging is easier. cc @dzaporozhets See merge request !3192
| * | Removed User#project_relationsprojects-finder-ee-compatibleYorick Peterse2016-03-122-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | GitLab EE adds an extra relation that selects a "project_id" column instead of an "id" column, making it very hard for this method to be re-used in EE. Since using User#authorized_groups in ProjectsFinder#all_groups apparently has no performance impact we can just use it and keep everything compatible with EE.
* | | Merge branch 'rs-disallow-blank-line-code' into 'master' Douwe Maan2016-03-121-1/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disallow blank (non-null) values for a Note's `line_code` attribute It's unclear how these blank values got added, but GitLab.com had a few: ``` irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count => 439 ``` We've added a migration to convert any existing records to use a NULL value when blank, and updated Note to set blank values to nil before validation. See merge request !3118
| * | Disallow blank (non-null) values for a Note's `line_code` attributers-disallow-blank-line-codeRobert Speicher2016-03-111-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's unclear how these blank values got added, but GitLab.com had a few: ``` irb(main):002:0> Note.where("line_code IS NOT NULL AND line_code = ''").count => 439 ``` We've added a migration to convert any existing records to use a NULL value when blank, and updated Note to set blank values to nil before validation.
* | | Merge branch 'fix/token-timing-attack' into 'master' Douwe Maan2016-03-122-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix token issue - timing attack Updates token comparisons to use a secure version instead of `==` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13617 See merge request !3062
| * | | add SHA256 to secure_comparefix/token-timing-attackJames Lopez2016-03-082-3/+3
| | | |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-03-08185-1704/+2045
| |\ \ \ | | | | | | | | | | | | | | | fix/token-timing-attack
| * | | | fix token issue - timing attackJames Lopez2016-03-022-3/+3
| | | | |
* | | | | Merge branch ↵Douwe Maan2016-03-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'nico-de-ceulaer/gitlab-ce-13865-handle-other-emails-for-avatar-lookup' # Conflicts: # app/helpers/application_helper.rb
| * | | | | ensure also alternative email addresses are used when looking up usernico de ceulaer2016-03-031-1/+1
| | | | | |
* | | | | | Merge branch 'fix_responsive_layout_bug' into 'master' Jacob Schatz2016-03-111-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix responsive bug top navigation Hi, I have found and fixed a minor layout bug (responsive) This is the situation before the fix: ![before](/uploads/55bf61a64fb49a763c5f8381bf46d390/before.png) And this is the situation after the fix: ![after](/uploads/33ba091156d404e52c41f134121c59f0/after.png) See merge request !3190
| * | | | | Fix responsive bug top navigationDennis van de Hoef2016-03-111-1/+1
| | | | | |
* | | | | | Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-111-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OR condition for source_project_id/target_project_id leads to a query plan that performs rather poorly on PostgreSQL due to the use of sub-queries. Because Rails offers no easy alternative for this particular problem we're forced to using a UNION for both conditions. The resulting query performs much faster than just using an OR.
* | | | | | Make Namespace.search case-insensitiveYorick Peterse2016-03-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures searching namespaces works exactly the same as searching for any other resource.
* | | | | | Removed arel_table receiver from search methodsYorick Peterse2016-03-116-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can just use "arel_table" in these cases instead of "SomeClass.arel_table".
* | | | | | Clean up ProjectsFinder for getting user projectsYorick Peterse2016-03-112-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need the extra layer of nesting of UNION queries here (as User#authorized_projects already returns a UNION'd query).
* | | | | | Refactor Gitlab::ProjectSearchResultsYorick Peterse2016-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this class would be given a project ID which was then used to retrieve the corresponding Project object. However, in all cases the Project object was already known as it was used to grab the ID to pass to ProjectSearchResults. By just passing a Project instead we remove the need for an extra query as well as the need for some other complexity in this class.
* | | | | | Refactor Gitlab::SnippetSearchResultsYorick Peterse2016-03-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | This removes the need for plucking snippet IDs into memory.
* | | | | | Refactor Gitlab::SearchResultsYorick Peterse2016-03-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of plucking IDs this class now uses ActiveRecord::Relation objects. Plucking IDs is problematic as searching for projects can lead to a huge amount of IDs being loaded into memory only to be used as an argument for another query (instead of just using a sub-query).
* | | | | | Use ILIKE/LIKE for searching milestonesYorick Peterse2016-03-111-2/+11
| | | | | |
* | | | | | Use ILIKE/LIKE for Issuable.search and full_searchYorick Peterse2016-03-111-2/+19
| | | | | |
* | | | | | Use ILIKE/LIKE for searching CI runnersYorick Peterse2016-03-111-3/+17
| | | | | |
* | | | | | Use ILIKE/LIKE for searching groupsYorick Peterse2016-03-111-1/+11
| | | | | |
* | | | | | Use ILIKE/LIKE for searching usersYorick Peterse2016-03-111-1/+15
| | | | | |
* | | | | | Use ILIKE/LIKE for searching notesYorick Peterse2016-03-111-1/+11
| | | | | |
* | | | | | Use ILIKE/LIKE for searching snippetsYorick Peterse2016-03-111-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously this used a regular LIKE which is case-sensitive on PostgreSQL. This ensures that for both PostgreSQL and MySQL the searching is case-insensitive similar to searching for projects.
* | | | | | Use ILIKE in Project.search_by_titleYorick Peterse2016-03-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the changes made to Project.search the method Project.search_by_title now also uses Arel so it can automatically use ILIKE/LIKE instead of the lower() function.
* | | | | | Use ILIKE/LIKE + UNION in Project.searchYorick Peterse2016-03-111-6/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This chance is broken up in two steps: 1. Use ILIKE on PostgreSQL and LIKE on MySQL, instead of using "WHERE lower(x) LIKE lower(y)" as ILIKE is significantly faster than using lower(). In many cases the use of lower() will force a slow sequence scan. 2. Instead of using 1 query that searches both projects and namespaces using a JOIN we're using 2 separate queries that are UNION'd together. Using a JOIN would force a slow sequence scan, using a UNION avoids this. This method now uses Arel as Arel automatically uses ILIKE on PostgreSQL and LIKE on MySQL, removing the need to handle this manually.
* | | | | | Merge branch 'group-activity-separate-tab' into 'master' Robert Speicher2016-03-116-18/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move group activity feed to separate page for consistency with dashboard and project pages Fixes #14161. Part of #13480 See merge request !3157
| * | | | | | Fix header titlegroup-activity-separate-tabDmitriy Zaporozhets2016-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Move group activity feed to separate page for consistency with dashboard and ↵Dmitriy Zaporozhets2016-03-106-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project pages Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'search-results-filter-dropdown' into 'master' Jacob Schatz2016-03-112-17/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved search results filter dropdown ## Current Currently filter dropdowns on search results page can be **very** long and off the page ![Screen_Shot_2016-03-11_at_15.25.24](/uploads/3418b0a6f4f8a0a8bd2441b53502c574/Screen_Shot_2016-03-11_at_15.25.24.png) ## New Changed over to the new dropdown ![Screen_Shot_2016-03-11_at_15.29.06](/uploads/2d3a4a9b3e50f3e0fc1748a026cd5905/Screen_Shot_2016-03-11_at_15.29.06.png) See merge request !3183
| * | | | | | | Increased dropdown max heightPhil Hughes2016-03-111-1/+1
| | | | | | | |
| * | | | | | | Improved search results filter dropdownPhil Hughes2016-03-111-16/+30
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'award-emoji-design-update' into 'master' Jacob Schatz2016-03-118-151/+188
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated UI of award emoji Closes #13878 See merge request !3028