summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve award emoji test reliability and eliminate sleepsimprove-award-emoji-specStan Hu2016-03-131-4/+1
| | | | Closes #14129
* Merge branch 'remove-goget-spec' into 'master' Douwe Maan2016-03-121-13/+0
|\ | | | | | | | | | | | | Remove unnecessary go-get test (superseded by middleware) See merge request !3193
| * Remove unnecessary go-get test (superseded by middleware)Stan Hu2016-03-121-13/+0
|/
* Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-126-82/+16
| | | This reverts merge request !3191
* Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-126-16/+82
|\ | | | | | | | | | | | | Support Golang subpackage fetching Closes #13805 See merge request !3191
| * Ensure PATH_INFO exists for go-getStan Hu2016-03-121-1/+1
| |
| * Add spec for go-import middlewareStan Hu2016-03-121-0/+30
| |
| * Simplify codeStan Hu2016-03-121-4/+3
| |
| * Remove existing go_import.html.haml implementationStan Hu2016-03-122-16/+0
| |
| * Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-123-0/+53
| | | | | | | | Closes #13805
* | 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 'filter-import-url' into 'master' Douwe Maan2016-03-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Filter import_url params because they may contain auth information. Fixes #14199 cc @dzaporozhets @DouweM tagging you since this is security related. See merge request !3174
| * | | Filter import_url params because they may contain auth information. Fixes #14199filter-import-urlJosh Frye2016-03-101-1/+1
| | |/ | |/|
* | | Merge branch 'fix-gh-pr-import' into 'master' Douwe Maan2016-03-123-45/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix importing PR's from GitHub when the source repo was removed Closes #13847 Closes gitlab-com/support-forum#584 See merge request !3172
| * | | Fix importing PR's from GitHub when the source repo was removedDouglas Barbosa Alexandre2016-03-103-45/+40
| | | |
* | | | Merge branch 'rs-disallow-blank-line-code' into 'master' Douwe Maan2016-03-123-1/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-113-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'ignore-byebug-history' into 'master' Douwe Maan2016-03-121-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore .byebug_history This allows me to use `git add .` without problems and retain all my history of `byebug` What do you think @DouweM? See merge request !3145
| * | | | Ignore .byebug_historyignore-byebug-historyZeger-Jan van de Weg2016-03-091-0/+1
| | | | |
* | | | | 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-08356-3055/+4414
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-113-18/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requests Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944 See merge request !2828
| * | | | | | | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-083-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/12944
* | | | | | | | | Merge branch 'trigram-index-searching' into 'master' Robert Speicher2016-03-1136-71/+926
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor searching and use PostgreSQL trigram indexes for significantly improved performance Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13743. Also fixes #12410 See merge request !2987
| * | | | | | | | | More detailed trigram migration error messagetrigram-index-searchingYorick Peterse2016-03-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This explains the user what they need to run and where to go in case they want to learn more about "CREATE EXTENSION".
| * | | | | | | | | Use a UNION in MergeRequest.in_projectsYorick Peterse2016-03-112-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | Added changelog entry for search performanceYorick Peterse2016-03-111-0/+1
| | | | | | | | | |
| * | | | | | | | | Added pg_trgm to the PostgreSQL requirementsYorick Peterse2016-03-111-0/+11
| | | | | | | | | |
| * | | | | | | | | Corrected spec title for Namespace.searchYorick Peterse2016-03-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Make Namespace.search case-insensitiveYorick Peterse2016-03-112-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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".
| * | | | | | | | | Fixed a few spec typosYorick Peterse2016-03-112-6/+6
| | | | | | | | | |
| * | | | | | | | | 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).
| * | | | | | | | | Removed order from sub-query projects for searchYorick Peterse2016-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to order queries used as sub-queries and doing so can add potential overhead.
| * | | | | | | | | Added ProjectSearchResults#project_ids_relationYorick Peterse2016-03-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures some other methods such as the "issues" method still work.
| * | | | | | | | | Fixed ProjectSearchResults spec to use a ProjectYorick Peterse2016-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This spec was still passing an ID to the #initialize method instead of a Project instance.
| * | | | | | | | | Disable Rubocop for PostgreSQL patchesYorick Peterse2016-03-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is mostly a copy-paste from existing pull requests so there's no point in running Rubocop on it.
| * | | | | | | | | Patch MySQL to ignore PostgreSQL schema optionsYorick Peterse2016-03-111-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that options such as `using: :gin` and PostgreSQL operator classes are ignored when loading a schema into a MySQL database.
| * | | | | | | | | Updated schema to include Pg operator classesYorick Peterse2016-03-111-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also includes e.g. the appearances table which apparently wasn't already included in the schema.
| * | | | | | | | | Backport Rails support for PostgreSQL opclassesYorick Peterse2016-03-111-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to support creating/dumping/loading indexes that use the gin_trgm_ops operator class on PostgreSQL. These changes are taken from Rails pull request https://github.com/rails/rails/pull/19090.
| * | | | | | | | | Refactor Gitlab::ProjectSearchResultsYorick Peterse2016-03-112-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-113-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for plucking snippet IDs into memory.
| * | | | | | | | | Refactor Gitlab::SearchResultsYorick Peterse2016-03-113-11/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
View Lorry Controller Status