summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
| * | Enable Style/EndOfLine Rubocop style copstyle/enable-rubocop-end-of-line-copGrzegorz Bizon2016-05-302-27/+27
| |/ | | | | | | Use Unix-style line endings. See #17478.
* | Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master' Robert Speicher2016-05-302-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Enable Lint/BlockAlignment Rubocop cop See #17478 See merge request !4346
| * | Enable Lint/BlockAlignment Rubocop copstyle/enable-block-alignment-rubocop-lintGrzegorz Bizon2016-05-302-3/+3
| |/ | | | | | | See #17478
* | Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' Robert Speicher2016-05-305-7/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/RedundantParentheses rubocop cop Checks for parentheses that seem not to serve any purpose. See #17478 See merge request !4361
| * | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-305-7/+6
| |/ | | | | | | See #17478
* | Merge branch 'rubocop/enable-space-before-comment-cop' into 'master' Robert Speicher2016-05-303-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Enable Style/SpaceBeforeComment rubocop cop See #17478 See merge request !4358
| * | Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-copGrzegorz Bizon2016-05-303-3/+3
| |/ | | | | | | See #17478
* | Merge branch 'rubocop/enable-space-after-method-name-cop' into 'master' Robert Speicher2016-05-302-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Enable Style/SpaceAfterMethodName rubocop cop Do not put a space between a method name and the opening parenthesis in a method definition. See #17478 See merge request !4359
| * | Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-copGrzegorz Bizon2016-05-302-2/+2
| |/ | | | | | | See #17478
* | Merge branch 'add-index-users-on-state' into 'master' Yorick Peterse2016-05-303-1/+12
|\ \ | |/ |/| | | | | Add DB index on users.state See merge request !4336
| * Add DB index on users.stateStan Hu2016-05-293-1/+12
|/ | | | Closes #17920
* Merge branch 'feature/note-validator' into 'master' Robert Speicher2016-05-3022-156/+299
|\ | | | | | | | | | | | | | | | | Improve note validation This MR improves note validation. Originates from #15577. Closes #17260 See merge request !4024
| * Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2
| | | | | | | | :heart:
| * Move Changelog entry for note validation to 8.9Grzegorz Bizon2016-05-291-1/+1
| |
| * Improve note factoryGrzegorz Bizon2016-05-296-21/+19
| |
| * Improve notes factoryGrzegorz Bizon2016-05-291-4/+1
| |
| * Add Changelog entry for note validation improvementsGrzegorz Bizon2016-05-291-0/+1
| |
| * Minor changes in note validation specsGrzegorz Bizon2016-05-294-19/+22
| |
| * Validate presence of noteable_type in note modelGrzegorz Bizon2016-05-291-0/+1
| |
| * Update specs to carry out changes in note factoryGrzegorz Bizon2016-05-2916-131/+259
| |
| * Do not override foreign attributes in note factoryGrzegorz Bizon2016-05-292-6/+5
| |
| * Add more validation tests for note modelGrzegorz Bizon2016-05-291-0/+27
| |
| * Remove redundant `with_options` from note validatorsGrzegorz Bizon2016-05-291-5/+3
| |
| * Update note factory to include noteable associationGrzegorz Bizon2016-05-292-15/+9
| |
| * Improve note validation for project mismatchGrzegorz Bizon2016-05-291-5/+7
| |
| * Make note invalid if noteable project is differentGrzegorz Bizon2016-05-291-0/+6
| | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
| * Remove reduntant note validation from create serviceGrzegorz Bizon2016-05-291-11/+0
| |
| * Update specs for creating new note without accessGrzegorz Bizon2016-05-291-2/+2
| |
* | Merge branch 'update_gitignore' into 'master' Robert Speicher2016-05-291-39/+39
|\ \ | |/ |/| | | | | Use absolute paths in .gitignore See merge request !4335
| * Use absolute paths wherever is possible for .gitignore entries.Ruben Davila2016-05-291-38/+38
| |