summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Create the specified remote directory during backuprs-create-remote-backup-folderRobert Speicher2016-05-311-1/+1
| | | | | | | This is idempotent, so there's no harm calling it if the directory already exists. Closes #12710
* Merge branch 'remove-dangling-notification-settings' into 'master' Stan Hu2016-05-312-0/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | Remove project notification settings associated with deleted projects On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge those entries. b8f38437 should prevent this issue from occurring in the first place. Closes gitlab-com/support-forum#678 See merge request !4311
| * Remove project notification settings associated with deleted projectsStan Hu2016-05-312-0/+14
| | | | | | | | | | | | | | | | | | | | On GitLab.com, there are 1560 project notification settings with no valid project all created on 2016-04-15 10:38:53 for some reason. This migration should purge those entries. b8f38437 should prevent this issue from occurring in the first place. Closes gitlab-com/support-forum#678
* | Merge branch 'container-registry-token-ttl' into 'master' Douwe Maan2016-05-3111-27/+80
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | Add Application Setting to configure Container Registry token expire delay (default 5min) This adds an option to configure Container Registry token expire delay. The default is set to 5mins (something that is also used by Docker Hub). What is left: * [x] Write test to check the expire_delay Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/17890 @stanhu I think that this should land in patch release of 8.8. See merge request !4364
| * Remove update of container_registry_token_expire_delayKamil Trzcinski2016-05-311-3/+0
| | | | | | | | This is not needed when we specify a default.
| * Fix rubocop offensesKamil Trzcinski2016-05-311-1/+1
| |
| * Set container_registry_token_expire_delay default to 5Kamil Trzcinski2016-05-312-3/+3
| |
| * Fix migration informationcontainer-registry-token-ttlKamil Trzcinski2016-05-311-13/+1
| |
| * Test token expirabilityKamil Trzcinski2016-05-311-0/+15
| |
| * Fix the use of CurrentSettings in ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-311-2/+7
| |
| * Update db/schema.rbKamil Trzcinski2016-05-311-24/+25
| |
| * Add Application Setting to configure Container Registry token expire delay ↵Kamil Trzcinski2016-05-319-3/+50
| | | | | | | | (default 5min)
* | Merge branch 'doc-upgrade-wrong-old-version' into 'master' Robert Schilling2016-05-310-0/+0
|\ \ | |/ |/| | | | | | | | | Update docs: previous version is 8.7 The old version is 8.7. See merge request !4288
| * Update docs: previous version is 8.7Florian Preinstorfer2016-05-251-1/+1
| |
* | Merge branch 'patch/wiki_page_events' into 'master' Rémy Coutable2016-05-315-2/+65
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Wiki Page events from Webhook admin UI in a Project * Added UI to enable page wiki events * Documentation for this event in Webhooks page Fixes #17506 --- ![new_webhook_UI](/uploads/63ef24b4ccef13ac7a5fda83e9ce64ad/new_webhook_UI.png) See merge request !4135
| * | Small fixes and added to the changelogpatch/wiki_page_eventsGabriel Mazetto2016-05-302-1/+2
| | |
| * | Added documentation to current Wiki Page event webhookGabriel Mazetto2016-05-301-0/+54
| | |
| * | Add Admin UI to enable Wiki Page events webhook in projectsGabriel Mazetto2016-05-303-2/+10
| | |
* | | Merge branch ↵Stan Hu2016-05-314-33/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'make-container-registry-authentication-service-compatible-with-older-docker' into 'master' Make authentication service for Container Registry to be compatible with < Docker 1.11 This removes the usage of `offline_token` which is only present when using `Docker 1.11.x` instead we relay on `scope`. This should make it compatible with any client starting from 1.6 (I did test only 1.8 and up). Right now we return 403 if unauthorized user doesn't have access to anything. In all other cases we return token, but with empty `access`, which simply disallow requested action. See merge request !4363
| * | | Make authentication service for Container Registry to be compatible with < ↵make-container-registry-authentication-service-compatible-with-older-dockerKamil Trzcinski2016-05-304-33/+20
| | | | | | | | | | | | | | | | Docker 1.11
* | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-05-301-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo Add missing "of" to CI YAML docs. [ci skip] See merge request !4331
| * | | | Fix typoAurelio Jargas2016-05-271-1/+1
| | | | |
* | | | | Merge branch 'docs-typo-fixes' into 'master' Robert Speicher2016-05-308-15/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various documentation typos and spelling mistakes [ci skip] See merge request !4345
| * | | | | succes -> successChris Spicer2016-05-291-4/+4
| | | | | |
| * | | | | errros -> errorsChris Spicer2016-05-291-1/+1
| | | | | |
| * | | | | Grammar fixes, simlink -> symlinkChris Spicer2016-05-291-3/+3
| | | | | |
| * | | | | occuring -> occurringChris Spicer2016-05-291-1/+1
| | | | | |
| * | | | | updtae -> updateChris Spicer2016-05-291-1/+1
| | | | | |
| * | | | | Add space after comma, add space between 'beautomatically'Chris Spicer2016-05-291-2/+2
| | | | | |
| * | | | | Add space between 'Criticalissue'Chris Spicer2016-05-291-1/+1
| | | | | |
| * | | | | commited -> committedChris Spicer2016-05-291-2/+2
| | | | | |
* | | | | | Merge branch 'issue_18009' into 'master' Robert Speicher2016-05-302-1/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing steps in update docs Fixes #18009 [ci skip] See merge request !4365
| * | | | | Fix 18009: add missing steps in update docsArian Sameni2016-05-302-1/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'rubocop/enable-space-before-comma-cop' into 'master' Robert Speicher2016-05-303-6/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/SpaceBeforeComma rubocop cop No spaces before commas. See #17478 See merge request !4360
| * | | | | Enable Style/SpaceBeforeComma rubocop coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-303-6/+17
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | No spaces before commas. See #17478
* | | | | Merge branch 'rubocop/enable-performance-times-map-cop' into 'master' Robert Speicher2016-05-302-9/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Performance/TimesMap Rubocop cop Use Array.new with a block instead of `.times.collect` / `.times.map`. See #17478 See merge request !4357
| * | | | | Enable Performance/TimesMap Rubocop coprubocop/enable-performance-times-map-copGrzegorz Bizon2016-05-302-9/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use Array.new with a block instead of `.times.collect` / `.times.map`. See #17478
* | | | | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-306-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/NegatedIf Rubocop cop Favor `unless` over `if` for negative conditions (or control flow ||). ```ruby # bad do_something if !some_condition # bad do_something if not some_condition # good do_something unless some_condition # good some_condition || do_something ``` See #17478 See merge request !4355
| * | | | | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-306-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Favor `unless` over `if` for negative conditions (or control flow ||). See #17478
* | | | | Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master' Robert Speicher2016-05-304-12/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Lint/LiteralInCondition rubocop cop Detects literals used in conditions. See #17478 See merge request !4354
| * | | | | Enable Lint/LiteralInCondition rubocop coprubocop/enable-literal-in-condition-copGrzegorz Bizon2016-05-304-12/+10
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Checks of literals used in conditions. See #17478
* | | | | Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master' Robert Speicher2016-05-302-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MultilineIfThen rubocop cop Do not use then for multi-line if. See #7478. See merge request !4353
| * | | | | Enable Style/MultilineIfThen rubocop copstyle/enable-multiline-if-then-rubocop-copGrzegorz Bizon2016-05-302-6/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Do not use then for multi-line if. See #7478.
* | | | | Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master' Robert Speicher2016-05-304-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/MethodDefParentheses rubocop cop Use def with parentheses when there are parameters. See #17478 See merge request !4352
| * | | | | Enable Style/MethodDefParentheses rubocop copstyle/enable-method-def-parentheses-rubocop-copGrzegorz Bizon2016-05-304-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Use def with parentheses when there are parameters. See #17478
* | | | | Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master' Robert Speicher2016-05-302-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/IndentAssignment Rubocop style cop Checks the indentation of the first line of the right-hand-side of a multi-line assignment. See #17478 See merge request !4348
| * | | | | Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-copGrzegorz Bizon2016-05-302-8/+8
| |/ / / / | | | | | | | | | | | | | | | See #17478
* | | | | Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master' Robert Speicher2016-05-303-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/WhileUntilDo rubocop style cop Checks for redundant `do` after `while` or `until`. See #17478 See merge request !4350
| * | | | | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-303-3/+3
| |/ / / / | | | | | | | | | | | | | | | See #17478
* | | | | Merge branch 'style/enable-rubocop-end-of-line-cop' into 'master' Robert Speicher2016-05-302-27/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/EndOfLine Rubocop style cop Use Unix-style line endings. Removed carriage return character from end of each line in `app/controllers/projects/find_file_controller.rb` See #17478 See merge request !4347
View Lorry Controller Status