summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove save_yaml_error from config_processor and don't create Ci::Commit if n...refactor_config_processor_saveKamil Trzcinski2016-06-014-26/+19
* Merge branch 'patch/wiki_page_events' into 'master' Rémy Coutable2016-05-315-2/+65
|\
| * 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 'make-container-registry-authentication-service-compatible-with-...Stan Hu2016-05-314-33/+20
|\ \
| * | Make authentication service for Container Registry to be compatible with < Do...make-container-registry-authentication-service-compatible-with-older-dockerKamil Trzcinski2016-05-304-33/+20
* | | Merge branch 'patch-1' into 'master' Robert Speicher2016-05-301-1/+1
|\ \ \
| * | | Fix typoAurelio Jargas2016-05-271-1/+1
* | | | Merge branch 'docs-typo-fixes' into 'master' Robert Speicher2016-05-308-15/+15
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 coprubocop/enable-space-before-comma-copGrzegorz Bizon2016-05-303-6/+17
| | |/ / | |/| |
* | | | Merge branch 'rubocop/enable-performance-times-map-cop' into 'master' Robert Speicher2016-05-302-9/+3
|\ \ \ \
| * | | | Enable Performance/TimesMap Rubocop coprubocop/enable-performance-times-map-copGrzegorz Bizon2016-05-302-9/+3
| |/ / /
* | | | Merge branch 'rubocop/enable-negatedif-style-cop' into 'master' Robert Speicher2016-05-306-6/+6
|\ \ \ \
| * | | | Enable Style/NegatedIf Rubocop coprubocop/enable-negatedif-style-copGrzegorz Bizon2016-05-306-6/+6
| |/ / /
* | | | Merge branch 'rubocop/enable-literal-in-condition-cop' into 'master' Robert Speicher2016-05-304-12/+10
|\ \ \ \
| * | | | Enable Lint/LiteralInCondition rubocop coprubocop/enable-literal-in-condition-copGrzegorz Bizon2016-05-304-12/+10
| |/ / /
* | | | Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master' Robert Speicher2016-05-302-6/+6
|\ \ \ \
| * | | | Enable Style/MultilineIfThen rubocop copstyle/enable-multiline-if-then-rubocop-copGrzegorz Bizon2016-05-302-6/+6
| |/ / /
* | | | Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master' Robert Speicher2016-05-304-5/+5
|\ \ \ \
| * | | | Enable Style/MethodDefParentheses rubocop copstyle/enable-method-def-parentheses-rubocop-copGrzegorz Bizon2016-05-304-5/+5
| |/ / /
* | | | Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master' Robert Speicher2016-05-302-8/+8
|\ \ \ \
| * | | | Enable Style/IndentAssignment Rubocop style copstyle/enable-rubocop-indent-assignment-copGrzegorz Bizon2016-05-302-8/+8
| |/ / /
* | | | Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master' Robert Speicher2016-05-303-3/+3
|\ \ \ \
| * | | | Enable Style/WhileUntilDo rubocop style copstyle/enable-while-until-do-rubocop-style-copGrzegorz Bizon2016-05-303-3/+3
| |/ / /
* | | | Merge branch 'style/enable-rubocop-end-of-line-cop' into 'master' Robert Speicher2016-05-302-27/+27
|\ \ \ \
| * | | | Enable Style/EndOfLine Rubocop style copstyle/enable-rubocop-end-of-line-copGrzegorz Bizon2016-05-302-27/+27
| |/ / /
* | | | Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master' Robert Speicher2016-05-302-3/+3
|\ \ \ \
| * | | | Enable Lint/BlockAlignment Rubocop copstyle/enable-block-alignment-rubocop-lintGrzegorz Bizon2016-05-302-3/+3
| |/ / /
* | | | Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master' Robert Speicher2016-05-305-7/+6
|\ \ \ \
| * | | | Enable Style/RedundantParentheses rubocop coprubocop/enable-redundant-parentheses-copGrzegorz Bizon2016-05-305-7/+6
| |/ / /
* | | | Merge branch 'rubocop/enable-space-before-comment-cop' into 'master' Robert Speicher2016-05-303-3/+3
|\ \ \ \
| * | | | Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-copGrzegorz Bizon2016-05-303-3/+3
| |/ / /
* | | | Merge branch 'rubocop/enable-space-after-method-name-cop' into 'master' Robert Speicher2016-05-302-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Enable Style/SpaceAfterMethodName rubocop coprubocop/enable-space-after-method-name-copGrzegorz Bizon2016-05-302-2/+2
| |/ /
* | | Merge branch 'add-index-users-on-state' into 'master' Yorick Peterse2016-05-303-1/+12
|\ \ \ | |/ / |/| |
| * | Add DB index on users.stateStan Hu2016-05-293-1/+12
|/ /
* | Merge branch 'feature/note-validator' into 'master' Robert Speicher2016-05-3022-156/+299
|\ \
| * | Shut up, RuboCopfeature/note-validatorRobert Speicher2016-05-291-2/+2