summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'security-hide_moved_issue_id' into 'master'GitLab Release Tools Bot2019-07-263-1/+44
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show moved issue ids for user not authorized Closes #2878 See merge request gitlab/gitlabhq!3230
| | * | | | | | | Do not show moved issue ids for user not authorizedFelipe Artur2019-07-113-1/+44
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Do not show moved issue id for users that cannot read issue
| * | | | | | | Merge branch 'security-bvl-filter-mr-params' into 'master'GitLab Release Tools Bot2019-07-264-8/+83
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter params in MR build service Closes #2879 See merge request gitlab/gitlabhq!3237
| | * | | | | | | Filter params in MR build serviceBob Van Landuyt2019-07-174-8/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reusing the existing `IssuableBaseService#filter_params` which uses the policies to determine what params a user can set, and which values it can be set to. This also removed the need for the seperate call to `IssuableBaseService#ensure_milestone_available`. The `Issues::BuildService` does not suffer from this because it limits the params that are assignable to the `title`, `description` and `milestone_id`.
| * | | | | | | | Update CHANGELOG.md for 12.1.2GitLab Release Tools Bot2019-07-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | Merge branch 'sh-fix-pdfjs-page-ordering' into 'master'Mike Greiling2019-07-293-9/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pdf.js rendering pages in the wrong order Closes #64467 See merge request gitlab-org/gitlab-ce!31222
| * | | | | | | | | Simplify pdf.js logicsh-fix-pdfjs-page-orderingLukas Eipert2019-07-292-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of complicated splicing, we can simply return all pages. Promise.all will take care of the correct ordering for us.
| * | | | | | | | | Fix pdf.js rendering pages in the wrong orderStan Hu2019-07-292-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was an implicit assumption that the pages returned from the Promise of `pdf.getPage(num)` would return in order, but no such guarantee exists. To handle this, we explicitly set which array index based on the page number and then trigger a Vue update via `splice`. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/64467
* | | | | | | | | | Merge branch 'resolve-spec-differences' into 'master'Lin Jen-Shin2019-07-295-9/+53
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve EE specific differences in the spec/ directory See merge request gitlab-org/gitlab-ce!31109
| * | | | | | | | | | Fix whitespace in wiki link filtering specsresolve-spec-differencesYorick Peterse2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures this spec is the same in both CE and EE.
| * | | | | | | | | | Make usage content spec the same for CE and EEYorick Peterse2019-07-291-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the spec in question so that it is the same for both CE and EE. This requires an `if Gitlab.ee?` since EE requires that we stub an EE specific module, but doing so in CE will break the spec there.
| * | | | | | | | | | Make protected tags spec the same for CE and EEYorick Peterse2019-07-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes a protected tags feature spec so that it is the same in both CE and EE. This requires the use of a `if Gitlab.ee?` check, as the added lines don't work in CE but do work in EE. Removing them entirely in turn breaks the EE spec.
| * | | | | | | | | | Backport ToDo feature specs from EEYorick Peterse2019-07-291-7/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that both CE and EE have the same specs.
| * | | | | | | | | | Backport EE changes for the schema specsYorick Peterse2019-07-291-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backports two EE specific changes made to the schema changes. We do not yet backport the EE prepend, as this will/can be done when https://gitlab.com/gitlab-org/gitlab-ce/issues/58170 is implemented.
* | | | | | | | | | | Merge branch 'remove-peek-pg' into 'master'Stan Hu2019-07-2913-127/+82
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace peek-pg with our own implementation Closes #44441 See merge request gitlab-org/gitlab-ce!31187
| * | | | | | | | | | | Replace peek-pg with our own implementationremove-peek-pgSean McGivern2019-07-2613-127/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This uses an ActiveRecord subscriber to get queries and calculate the total query time from that. This means that the total will always be consistent with the queries in the table. It does however mean that we could potentially miss some queries that don't go through ActiveRecord. Making this change also allows us to unify the response JSON a little bit, making the frontend slightly simpler as a result.
* | | | | | | | | | | | Merge branch '64190-add-mr-form' into 'master'Paul Slaughter2019-07-2920-271/+591
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Support runtime Visual Review configuration" See merge request gitlab-org/gitlab-ce!30481
| * | | | | | | | | | | Add MR form to runtime Visual Review configurationSarah Groff Hennigh-Palermo2019-07-2920-271/+591
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adds the ability to enter a merge request ID directly into the toolbar, * adds the option to save the ID to `localStorage` (as with the token), * adds a link to change the ID once entered * adds some more explanatory errors for 401 & 404 * saves the comment to session storage if the user navigates away without posting it
* | | | | | | | | | | Merge branch 'resolve-scripts-differences' into 'master'Lin Jen-Shin2019-07-296-2/+152
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport EE changes made to the scripts/ directory See merge request gitlab-org/gitlab-ce!31015
| * | | | | | | | | | | Backport EE changes made to the scripts/ directoryresolve-scripts-differencesYorick Peterse2019-07-296-2/+152
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This backport changes made by EE to the files in the scripts/ directory. This comes with a few changes to some scripts to make them work in the single codebase setup.
* | | | | | | | | | | Merge branch 'tp-resolve-performance-14' into 'master'Mek Stittri2019-07-291-9/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update reference architecture docs to remove status Closes gitlab-org/quality/performance#14 See merge request gitlab-org/gitlab-ce!31077
| * | | | | | | | | | | Update reference architecture docs to remove statusTanya Pazitny2019-07-291-9/+6
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'ce-port-4550-add-project-download-export-audit-event' into ↵Stan Hu2019-07-293-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' CE: Add project download & project export audit event See merge request gitlab-org/gitlab-ce!31103
| * | | | | | | | | | | CE: Add project download & project export audit eventce-port-4550-add-project-download-export-audit-eventmanojmj2019-07-263-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds audit events for download of repository and export of project.
* | | | | | | | | | | | Merge branch 'ab-remove-postgresql-switches' into 'master'Nick Thomas2019-07-2933-319/+94
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further remove `if postgresql?` branches Closes #65054 See merge request gitlab-org/gitlab-ce!31102
| * | | | | | | | | | | | Refactor and remove #prepare_relation methodAndreas Brandl2019-07-297-18/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65054
| * | | | | | | | | | | | Further remove code branches by database typeAndreas Brandl2019-07-2927-303/+90
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We dropped MySQL support and a lot of mysql specific code has been removed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/29608. This comes in from the other direction and removes any `if postgresql?` branches.
* | | | | | | | | | | | Merge branch '56752-replace-sidekiq-metrics' into 'master'Kamil Trzciński2019-07-293-0/+106
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds direct monitoring for sidekiq metrics Closes #56752 See merge request gitlab-org/gitlab-ce!30916
| * | | | | | | | | | | | Adds direct monitoring for sidekiq metricsRyan Cobb2019-07-293-0/+106
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds diirect monitoring for sidekiq metrics. This is done via sidekiq middleware and a sampler to pull from sidekiqs api.
* | | | | | | | | | | | Merge branch 'add-git-blame-api' into 'master'Nick Thomas2019-07-295-0/+274
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose git blame in api Closes #51345 See merge request gitlab-org/gitlab-ce!30675
| * | | | | | | | | | | Add git blame apiOleg Zubchenko2019-07-265-0/+274
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'docs/ip-access-restriction-ultimate-only' into 'master'51771-notifications-for-when-pipelines-are-fixedMarcia Ramos2019-07-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update IP access restriction docs See merge request gitlab-org/gitlab-ce!31189
| * | | | | | | | | | | | Update IP access restriction docsCindy Pallares 🦉2019-07-291-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/fix-deploy-example' into 'master'Marcia Ramos2019-07-292-13/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deploy example and other fixes Closes #65092 See merge request gitlab-org/gitlab-ce!31225
| * | | | | | | | | | | | Fix deploy example and other fixesEvan Read2019-07-292-13/+22
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'docs/split-autodevops-variable-table' into 'master'Marcia Ramos2019-07-291-36/+59
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Categorize autodevops variables Closes #59817 See merge request gitlab-org/gitlab-ce!31226
| * | | | | | | | | | | | Categorize autodevops variablesEvan Read2019-07-291-36/+59
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'fj-navbar-searches-usage-ping-counter' into 'master'Paul Slaughter2019-07-298-7/+70
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added navbar searches usage ping counter Closes #63887 See merge request gitlab-org/gitlab-ce!30953
| * | | | | | | | | | | | Added navbar searches usage ping counterFrancisco Javier López2019-07-298-7/+70
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added usage ping counter when the user makes a search through the navbar search component.
* | | | | | | | | | | | Merge branch 'projects-controller-private' into 'master'Lin Jen-Shin2019-07-291-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate private methods under the keyword on projects controller See merge request gitlab-org/gitlab-ce!31223
| * | | | | | | | | | | | Separate private methods under the keyword on projects controllerFurkan Ayhan2019-07-281-10/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'qa-sl-move-mattermost-group-spec' into 'master'Ramya Authappan2019-07-291-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move create group with mattermost spec to correct dir See merge request gitlab-org/gitlab-ce!31173
| * | | | | | | | | | | | | Move create group with mattermost spec to correct dirqa-sl-move-mattermost-group-specSanad Liaquat2019-07-261-0/+0
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'frozen_string_spec_features' into 'master'Rémy Coutable2019-07-29521-4/+1046
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to spec/features See merge request gitlab-org/gitlab-ce!31131
| * | | | | | | | | | | | | | Fix can't modify frozen String errorsfrozen_string_spec_featuresThong Kuah2019-07-264-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use unary plus as recommended by Performance/UnfreezeString cop
| * | | | | | | | | | | | | | Add frozen_string_literal to spec/featuresThong Kuah2019-07-26521-0/+1042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | | | | | | | | | | | Merge branch 'mc/feature/manual-job-variables' into 'master'Phil Hughes2019-07-2929-23/+549
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specifying variables when running manual jobs Closes #24935 See merge request gitlab-org/gitlab-ce!30485
| * | | | | | | | | | | | | | | Add Job specific variablesMatija Čupić2019-07-2929-23/+549
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds Job specific variables to facilitate specifying variables when running manual jobs.
* | | | | | | | | | | | | | | Merge branch ↵Kushal Pandya2019-07-295-14/+122
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blue' into 'master' Resolve "Add color selector for broadcast messages" Closes #61787 See merge request gitlab-org/gitlab-ce!30988
| * | | | | | | | | | | | | | | Add default colors for broadcast messages61787-the-colour-selector-for-broadcast-messages-should-provide-a-few-default-options-with-descriptive-labels-like-red-green-blueAmmar Alakkad2019-07-263-14/+62
| | | | | | | | | | | | | | | |