summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | move the ability check to reject_users_without_accesshttp://jneen.net/2017-08-031-1/+2
| | |
* | | Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2017-08-042-28/+24
|\ \ \ | | | | | | | | | | | | | | | | Bump rspec to 3.6.0 See merge request !13293
| * | | Bump rspec to 3.6.0rs-update-rspecRobert Speicher2017-08-032-28/+24
| | | |
* | | | Merge branch 'fix-jira-integration' into 'master'Rémy Coutable2017-08-042-2/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it See merge request !13240
| * | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling itMehdi Lahmam2017-08-032-2/+15
| | | | |
* | | | | Merge branch 'remove-monkey-patched-array-prototypes' into 'master'Clement Ho2017-08-0416-52/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove monkey-patched Array.prototype.first() and last() methods See merge request !13213
| * | | | | Remove monkey-patched Array.prototype.first() and last() methodsMike Greiling2017-08-0416-52/+11
|/ / / / /
* | | | | Merge branch 'diff-changed-files-dropdown' into 'master'Filipa Lacerda2017-08-0412-41/+229
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved changed files into a dropdown Closes #29778 See merge request !13128
| * | | | | use new dropdown stylingdiff-changed-files-dropdownPhil Hughes2017-08-031-0/+1
| | | | | |
| * | | | | fixed alert box moving when is-stuck gets addedPhil Hughes2017-08-031-2/+4
| | | | | |
| * | | | | dont assign to variable, just output directlyPhil Hughes2017-08-031-6/+3
| | | | | |
| * | | | | fixed z-index issue with merge request versions widgetPhil Hughes2017-08-031-0/+2
| | | | | |
| * | | | | fixed karma failurePhil Hughes2017-08-031-0/+2
| | | | | |
| * | | | | fixed alignment in buttonPhil Hughes2017-08-032-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | correctly scroll to element with sticky height offset
| * | | | | fixed jumping when bar gets stuckPhil Hughes2017-08-035-14/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added specs to sticky util file added `No files found.` text when results are empty
| * | | | | made the changed files holder stickyPhil Hughes2017-08-034-4/+77
| | | | | |
| * | | | | fixed haml lintPhil Hughes2017-08-034-3/+12
| | | | | |
| * | | | | Moved changed files into a dropdownPhil Hughes2017-08-035-38/+70
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes navigating through diff files quickly. Currently we just toggle a list, which could be pretty big. This moves it into a dropdown to make it much easier. Also includes a filter bar to quickly search for certain files/extensions. Closes #29778
* | | | | Merge branch 'rs-minor-banzai-perf' into 'master'Douwe Maan2017-08-041-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't bother going through an entire Banzai pipeline for empty text See merge request !13300
| * | | | | Don't bother going through an entire Banzai pipeline for empty textrs-minor-banzai-perfRobert Speicher2017-08-031-0/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bails out of `cacheless_render` immediately unless the provided text is present, since there's no point. This is a slight improvement in our test performance. Across the creation of 1,000 `Namespace` records, which caches the `description` field and which is blank by default in its factory, this saves about four seconds, which... sure. Why not.
* | | | | Merge branch '34904-specific-async-script-loading-by-using-a-page-variable' ↵Phil Hughes2017-08-0346-26/+92
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Specific Async Script Loading by using a Page Variable" Closes #34904 See merge request !12759
| * | | | Resolve "Specific Async Script Loading by using a Page Variable"Tim Zallmann2017-08-0346-26/+92
|/ / / /
* | | | Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-038-22/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid plucking Todo ids in TodoService - take 2 See merge request !11415
| * | | | Add workaround for UPDATE with subquery when using MySQLToon Claes2017-08-031-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to run an UPDATE, this query is ran: ```sql UPDATE `todos` INNER JOIN `projects` ON `projects`.`id` = `todos`.`project_id` SET `todos`.`state` = 'done' WHERE `todos`.`user_id` = 4 AND (`todos`.`state` IN ('pending')) AND (EXISTS (SELECT 1 FROM `project_authorizations` WHERE `project_authorizations`.`user_id` = 4 AND (project_authorizations.project_id = projects.id)) OR projects.visibility_level IN (10, 20)) AND `projects`.`id` IN (SELECT `todos`.`project_id` FROM `todos` WHERE `todos`.`user_id` = 4 AND (`todos`.`state` IN ('pending'))) AND (`todos`.`state` != 'done') ``` But MySQL does not like the subquery used to filter on `projects.id IN (SELECT ...` Because the subquery queries from the same table: > Error: You can’t specify target table ‘todos’ for update in FROM clause So as workaround, wrap it in another subquery, where the original subquery is aliased using the `AS` statement. Mostly inspired by https://stackoverflow.com/a/43610081/89376
| * | | | Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-037-20/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
* | | | | Merge branch 'winh-dropdown-mixin' into 'master'Annabel Dunstone Gray2017-08-034-64/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use mixin for new dropdown style See merge request !13274
| * | | | | Use mixin for new dropdown styleWinnie Hellmann2017-08-034-64/+11
|/ / / / /
* | | | | Merge branch 'dev.referable-inspect' into 'master'Sean McGivern2017-08-032-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | implement #inspect for all Referables See merge request !13285
| * | | | | implement #inspect for all Referablesdev.referable-inspecthttp://jneen.net/2017-08-012-0/+17
| | | | | |
* | | | | | Merge branch '3686_make_tarball_download_url' into 'master'Rémy Coutable2017-08-034-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #3686 make tarball download url to end with extension Closes #3686 See merge request !13178
| * | | | | | fix #3686 make tarball download url to end with extensionhaseeb2017-08-034-5/+13
|/ / / / / /
* | | | | | Merge branch 'use-rspec-support-helper' into 'master'Rémy Coutable2017-08-0314-51/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't include EmailHelpers manually, pick with rspec See merge request !13257
| * | | | | | Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-0314-51/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
* | | | | | | Merge branch '35133_strip_newlines_from_ssh_keys' into 'master'Rémy Coutable2017-08-032-8/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix #35133 strip new lines from ssh keys Closes #35133 See merge request !13234
| * | | | | | | fix #35133 strip new lines from ssh keyshaseeb2017-08-032-8/+9
|/ / / / / / /
* | | | | | | Merge branch 'reorganise-issues-indexes-for-sorting' into 'master'Sean McGivern2017-08-033-3/+51
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Re-organise "issues" indexes for faster ordering See merge request !13278
| * | | | | | Re-organise "issues" indexes for faster orderingreorganise-issues-indexes-for-sortingYorick Peterse2017-08-033-3/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding various composite indexes we can reduce the time spent retrieving issue lists. Because of the way these indexes are built column wise we can also remove some standalone indexes, keeping the total number of indexes in check.
* | | | | | | Merge branch 'fix-oauth-checkboxes' into 'master'Filipa Lacerda2017-08-033-0/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
| * | | | | | | Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxesPhil Hughes2017-08-033-0/+13
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Closes #35882
* | | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-035-31/+57
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitaly Closes gitaly#415 See merge request !13121
| * | | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-025-31/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#415
* | | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-035-5/+388
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Merge request commits background migration See merge request !12685
| * | | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-035-5/+388
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the `merge_request_diffs` table. These now have their own tables - `merge_request_diff_{commits,diffs}` - with a column for each attribute of the serialised data. Add a background migration to go through the existing MR diffs and migrate them to the new format. Ignore any contents that cannot be displayed. Assuming that we have 5 million rows to migrate, and each batch of 2,500 rows can be completed in 5 minutes, this will take about 7 days to migrate everything.
* | | | | | | | Merge branch 'patch-1' into 'master'Achilleas Pipinellis2017-08-031-31/+32
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move API "basic usage" to be more visible See merge request !13171
| * | | | | | | | Explicitly spell out where the API root isAJ Jordan2017-07-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found this basic information extrememly hard to find when I looked at this page.
| * | | | | | | | Move API "basic usage" to be more visibleAJ Jordan2017-07-281-31/+31
| | | | | | | | |
* | | | | | | | | Merge branch 'abuango-imap-doc-fix' into 'master'Achilleas Pipinellis2017-08-031-0/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update reply_by_email_postfix_setup.md, included starting courier-authdaemon after installation. See merge request !13218
| * | | | | | | | Update reply_by_email_postfix_setup.md, included starting courier-authdaemon ↵Abubakar Ango2017-08-031-0/+14
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | after installation.
* | | | | | | | Merge branch '35232-next-unresolved' into 'master'Clement Ho2017-08-032-5/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix Jump to next discussion Closes #35232 See merge request !13076
| * | | | | | | | fix Jump to next discussion35232-next-unresolvedSimon Knox2017-07-272-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes tab was renamed to show, was previously overridden in merge_request_tabs.js