summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | Merge branch '28517-discover-by-userid' into 'master'Douwe Maan2017-06-201-3/+8
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow discover by userid - issue 28517 Closes #28517 See merge request !12314
| | * | | | | | | | | Allow discover by userid - issue 28517Matt Walsh2017-06-201-3/+8
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'fix-email-avatars' into 'master'Douwe Maan2017-06-204-39/+68
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar images in pipeline emails Closes gitlab-ee#2696 See merge request !12310
| | * | | | | | | | | | Fix avatar images in pipeline emailsfix-email-avatarsSean McGivern2017-06-204-39/+68
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch '33922-add-ruby-metrics-documentation' into 'master'Achilleas Pipinellis2017-06-203-2/+57
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for GitLab ruby monitoring See merge request !12295
| | * | | | | | | | | | Add Prometheus metrics documentation33922-add-ruby-metrics-documentationJoshua Lambert2017-06-193-2/+57
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-204-31/+67
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show 'Edit comment'/'Report as abuse' when user has perms/isnt current_user See merge request !12096
| | * | | | | | | | | | Remove PersonalSnippet case for reportable_note specshide-edit-comment-and-report-as-abuse-conditionallyLuke "Jared" Bennett2017-06-202-40/+8
| | | | | | | | | | | |
| | * | | | | | | | | | Fixed reportable_note_shared_example for the reportable_note/snippets_specLuke "Jared" Bennett2017-06-162-15/+37
| | | | | | | | | | | |
| | * | | | | | | | | | Pass more_actions_dropdown vie spec locals to render call instead of ↵Luke "Jared" Bennett2017-06-161-44/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stubbing them
| | * | | | | | | | | | Add view spec for more_actions_dropdown render branchesLuke "Jared" Bennett2017-06-162-18/+87
| | | | | | | | | | | |
| | * | | | | | | | | | [ci skip] Correct rendering more actions dropdown when there are no actions ↵Luke "Jared" Bennett2017-06-161-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and correct the more actions dropdown divider conditional
| | * | | | | | | | | | Correct 'report as abuse' nesting in _more_actions_dropdown.html.hamlLuke "Jared" Bennett2017-06-161-4/+4
| | | | | | | | | | | |
| | * | | | | | | | | | Update _more_actions_dropdown.html.haml to only show 'Edit comment' when ↵Luke "Jared" Bennett2017-06-161-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user is allowed to edit the note and only show 'Report as abuse' when the note doesn't belong to current_user
| * | | | | | | | | | | Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-206-8/+26
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some incorrect usage of translation helpers See merge request !12274
| | * | | | | | | | | | | Fix some incorrect usage of translation helpersfix-i18n-helpersRuben Davila2017-06-196-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/projects/pipeline_schedules/_form.html.haml
| * | | | | | | | | | | | Merge branch 'refactor-projects-finder-init-collection' into 'master'Rémy Coutable2017-06-2010-59/+234
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor ProjectsFinder#init_collection and GroupProjectsFinder#init_collection Closes #33632 See merge request !12135
| | * | | | | | | | | | | | Refactor GroupProjectsFinder#init_collectionYorick Peterse2017-06-195-38/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This optimises how GroupProjectsFinder builds it collection, producing simpler and faster queries in the process. It also cleans up the code a bit to make it easier to understand.
| | * | | | | | | | | | | | Refactor Project.with_feature_available_for_userYorick Peterse2017-06-163-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method used to use a UNION, which would lead to it performing the same query twice; producing less than ideal performance. Further, in certain cases ActiveRecord could get confused and mess up the variable bindings, though it's not clear how/why exactly this happens. Fortunately we can work around all of this by building some of the WHERE conditions manually, allowing us to use a simple OR statement to get all the data we want without any of the above problems.
| | * | | | | | | | | | | | Refactor ProjectsFinder#init_collectionYorick Peterse2017-06-164-31/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes ProjectsFinder#init_collection so it no longer relies on a UNION. For example, to get starred projects of a user we used to run: SELECT projects.* FROM projects WHERE projects.pending_delete = 'f' AND ( projects.id IN ( SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id INNER JOIN project_authorizations ON projects.id = project_authorizations.project_id WHERE projects.pending_delete = 'f' AND project_authorizations.user_id = 1 AND users_star_projects.user_id = 1 UNION SELECT projects.id FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.visibility_level IN (20, 10) AND users_star_projects.user_id = 1 ) ) ORDER BY projects.id DESC; With these changes the above query is turned into the following instead: SELECT projects.* FROM projects INNER JOIN users_star_projects ON users_star_projects.project_id = projects.id WHERE projects.pending_delete = 'f' AND ( EXISTS ( SELECT 1 FROM project_authorizations WHERE project_authorizations.user_id = 1 AND (project_id = projects.id) ) OR projects.visibility_level IN (20,10) ) AND users_star_projects.user_id = 1 ORDER BY projects.id DESC; This query in turn produces a better execution plan and takes less time, though the difference is only a few milliseconds (this however depends on the amount of data involved and additional conditions that may be added).
| * | | | | | | | | | | | | Merge branch 'docs/subgroups-mysql' into 'master'Marcia Ramos2017-06-203-58/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention limitations of MySQL in docs See merge request !12272
| | * | | | | | | | | | | | | Add link to issue for MySQL/subgroups drop supportAchilleas Pipinellis2017-06-202-2/+5
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Mention limitations of MySQL in docsAchilleas Pipinellis2017-06-193-58/+50
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'remove-changelog' into 'master'Clement Ho2017-06-201-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove changelog entry See merge request !12309
| | * | | | | | | | | | | | | Remove changelog entryAnnabel Dunstone Gray2017-06-201-4/+0
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch ↵Annabel Dunstone Gray2017-06-203-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33363-user-customize-callout-has-no-top-margin-on-projects-page' into 'master' Resolve "User customize callout has no top-margin on projects page" Closes #33592 and #33363 See merge request !12090
| | * | | | | | | | | | | | | | Resolve "User customize callout has no top-margin on projects page"Luke "Jared" Bennett2017-06-203-4/+2
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'search-clear-button-center' into 'master'Annabel Dunstone Gray2017-06-201-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed filtered search clear button being off-center Closes #33912 See merge request !12304
| | * | | | | | | | | | | | | | Fixed filtered search clear button being off-centersearch-clear-button-centerPhil Hughes2017-06-201-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33912
| * | | | | | | | | | | | | | | Merge branch '31349-async-buttons' into 'master'Phil Hughes2017-06-2016-443/+271
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniformize code between both pipelines tables Closes #31349, #33754, and #31181 See merge request !12232
| | * | | | | | | | | | | | | | | Uniformize code between both pipelines tablesFilipa Lacerda2017-06-2016-443/+271
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch '33260-allow-admins-to-list-admins' into 'master'Rémy Coutable2017-06-206-4/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-instate is_admin flag in users API is current user is an admin Closes #33260 See merge request !12211
| | * | | | | | | | | | | | | | | Re-instate is_admin flag in users API is current user is an adminMike Ricketts2017-06-206-4/+53
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqkushalpandya2017-06-201-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | / / / / / / / | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch '33840-revert-sticky-confidential-header' into 'master'confidential-issues-revertClement Ho2017-06-204-37/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert sticky confidential header Closes #33840 See merge request !12307
| | * | | | | | | | | | | | | | Revert sticky confidential headerAnnabel Dunstone Gray2017-06-204-37/+43
| | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Revert "Merge branch 'confidential-issues-redesign-docs' into 'master'"Victor Wu2017-06-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !12195
| * | | | | | | | | | | | | | Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' ↵Sean McGivern2017-06-204-2/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Do not enable prometheus metrics when metrics folder is missing See merge request !12263
| | * | | | | | | | | | | | | | use proper `if defined?` check.33823_do_not_enable_defaults_when_metrics_folder_is_missingPawel Chojnacki2017-06-201-2/+5
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Do not enable prometheus metrics when data folder is not present.Pawel Chojnacki2017-06-194-2/+49
| | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + Set defaults correctly only for when not in production or staging + set ENV['prometheus_multiproc_dir'] in config/boot.rb instead of config.ru Test prometheus metrics unmemoized
| * | | | | | | | | | | | | | Merge branch 'api-doc-os-license-alphabetical-order' into 'master'Rémy Coutable2017-06-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved Open source license templates link into alphabetical order See merge request !12294
| | * | | | | | | | | | | | | | Moved Open source license templates link into alphabetical orderMike Fisher2017-06-191-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'dm-chat-message-backticks' into 'master'Sean McGivern2017-06-204-16/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as code See merge request !12276
| | * | | | | | | | | | | | | | | Remove backticks from chat messages because they're not rendered as codedm-chat-message-backticksDouwe Maan2017-06-194-16/+16
| | | |_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'issue-task-status-fix' into 'master'Filipa Lacerda2017-06-206-34/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop showing task status if no tasks are present Closes #33880 See merge request !12303
| | * | | | | | | | | | | | | | Stop showing task status if no tasks are presentPhil Hughes2017-06-206-34/+41
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the task status would be visible even if there where no tasks in the description. This fixes that by changing the regex to check for tasks without 0. This also fixes a bug where update the description inline would not update the task status text on screen. Closes #33880
* | | | | | | | | | | | | | | Fixes scrolling + improves Performance through assigning found $ elements to ↵Tim Zallmann2017-06-202-7/+16
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | variables
* | | | | | | | | | | | | | Merge branch 'winh-cleanup-vue-warnings' into 'master'Phil Hughes2017-06-206-2/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up Vue warnings in tests Closes #33624, #32965, and #33622 See merge request !12163
| * | | | | | | | | | | | | | Clean up Vue warnings in testsWinnie Hellmann2017-06-206-2/+33
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch ↵Phil Hughes2017-06-201-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33734-transient-karma-failure-on-master-for-date-time-utils-timefor-returns-remaining-time-when-in-the-future' into 'master' Resolve "Transient karma failure on master for `Date time utils timeFor returns remaining time when in the future`" Closes #33734 See merge request !12227