delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove redundant factory namespace in build specsrefactoring/improve-build-specs	Grzegorz Bizon	2016-05-31	1	-22/+20
\| \| \| \| \|	Conflicts: spec/models/build_spec.rb
*	Merge branch ↵	Stan Hu	2016-05-31	4	-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-docker	Kamil Trzcinski	2016-05-30	4	-33/+20
\| \| \| \| \| \| \| \|	Docker 1.11
* \|	Merge branch 'patch-1' into 'master'	Robert Speicher	2016-05-30	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo Add missing "of" to CI YAML docs. [ci skip] See merge request !4331
\| * \|	Fix typo	Aurelio Jargas	2016-05-27	1	-1/+1
\| \| \|
* \| \|	Merge branch 'docs-typo-fixes' into 'master'	Robert Speicher	2016-05-30	8	-15/+15
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix various documentation typos and spelling mistakes [ci skip] See merge request !4345
\| * \| \|	succes -> success	Chris Spicer	2016-05-29	1	-4/+4
\| \| \| \|
\| * \| \|	errros -> errors	Chris Spicer	2016-05-29	1	-1/+1
\| \| \| \|
\| * \| \|	Grammar fixes, simlink -> symlink	Chris Spicer	2016-05-29	1	-3/+3
\| \| \| \|
\| * \| \|	occuring -> occurring	Chris Spicer	2016-05-29	1	-1/+1
\| \| \| \|
\| * \| \|	updtae -> update	Chris Spicer	2016-05-29	1	-1/+1
\| \| \| \|
\| * \| \|	Add space after comma, add space between 'beautomatically'	Chris Spicer	2016-05-29	1	-2/+2
\| \| \| \|
\| * \| \|	Add space between 'Criticalissue'	Chris Spicer	2016-05-29	1	-1/+1
\| \| \| \|
\| * \| \|	commited -> committed	Chris Spicer	2016-05-29	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch 'issue_18009' into 'master'	Robert Speicher	2016-05-30	2	-1/+17
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing steps in update docs Fixes #18009 [ci skip] See merge request !4365
\| * \| \| \|	Fix 18009: add missing steps in update docs	Arian Sameni	2016-05-30	2	-1/+17
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'rubocop/enable-space-before-comma-cop' into 'master'	Robert Speicher	2016-05-30	3	-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-cop	Grzegorz Bizon	2016-05-30	3	-6/+17
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No spaces before commas. See #17478
* \| \| \|	Merge branch 'rubocop/enable-performance-times-map-cop' into 'master'	Robert Speicher	2016-05-30	2	-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-cop	Grzegorz Bizon	2016-05-30	2	-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 Speicher	2016-05-30	6	-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-cop	Grzegorz Bizon	2016-05-30	6	-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 Speicher	2016-05-30	4	-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-cop	Grzegorz Bizon	2016-05-30	4	-12/+10
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checks of literals used in conditions. See #17478
* \| \| \|	Merge branch 'style/enable-multiline-if-then-rubocop-cop' into 'master'	Robert Speicher	2016-05-30	2	-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-cop	Grzegorz Bizon	2016-05-30	2	-6/+6
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not use then for multi-line if. See #7478.
* \| \| \|	Merge branch 'style/enable-method-def-parentheses-rubocop-cop' into 'master'	Robert Speicher	2016-05-30	4	-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-cop	Grzegorz Bizon	2016-05-30	4	-5/+5
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use def with parentheses when there are parameters. See #17478
* \| \| \|	Merge branch 'style/enable-rubocop-indent-assignment-cop' into 'master'	Robert Speicher	2016-05-30	2	-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-cop	Grzegorz Bizon	2016-05-30	2	-8/+8
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \|	Merge branch 'style/enable-while-until-do-rubocop-style-cop' into 'master'	Robert Speicher	2016-05-30	3	-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-cop	Grzegorz Bizon	2016-05-30	3	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \|	Merge branch 'style/enable-rubocop-end-of-line-cop' into 'master'	Robert Speicher	2016-05-30	2	-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-cop	Grzegorz Bizon	2016-05-30	2	-27/+27
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Use Unix-style line endings. See #17478.
* \| \| \|	Merge branch 'style/enable-block-alignment-rubocop-lint' into 'master'	Robert Speicher	2016-05-30	2	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Lint/BlockAlignment Rubocop cop See #17478 See merge request !4346
\| * \| \| \|	Enable Lint/BlockAlignment Rubocop copstyle/enable-block-alignment-rubocop-lint	Grzegorz Bizon	2016-05-30	2	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \|	Merge branch 'rubocop/enable-redundant-parentheses-cop' into 'master'	Robert Speicher	2016-05-30	5	-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-cop	Grzegorz Bizon	2016-05-30	5	-7/+6
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \|	Merge branch 'rubocop/enable-space-before-comment-cop' into 'master'	Robert Speicher	2016-05-30	3	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable Style/SpaceBeforeComment rubocop cop See #17478 See merge request !4358
\| * \| \| \|	Enable Style/SpaceBeforeComment rubocop coprubocop/enable-space-before-comment-cop	Grzegorz Bizon	2016-05-30	3	-3/+3
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	See #17478
* \| \| \|	Merge branch 'rubocop/enable-space-after-method-name-cop' into 'master'	Robert Speicher	2016-05-30	2	-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-cop	Grzegorz Bizon	2016-05-30	2	-2/+2
\| \|/ / \| \| \| \| \| \| \| \| \|	See #17478
* \| \|	Merge branch 'add-index-users-on-state' into 'master'	Yorick Peterse	2016-05-30	3	-1/+12
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Add DB index on users.state See merge request !4336
\| * \|	Add DB index on users.state	Stan Hu	2016-05-29	3	-1/+12
\|/ / \| \| \| \| \| \|	Closes #17920
* \|	Merge branch 'feature/note-validator' into 'master'	Robert Speicher	2016-05-30	22	-156/+299
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve note validation This MR improves note validation. Originates from #15577. Closes #17260 See merge request !4024
\| * \|	Shut up, RuboCopfeature/note-validator	Robert Speicher	2016-05-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	:heart:
\| * \|	Move Changelog entry for note validation to 8.9	Grzegorz Bizon	2016-05-29	1	-1/+1
\| \| \|
\| * \|	Improve note factory	Grzegorz Bizon	2016-05-29	6	-21/+19
\| \| \|
\| * \|	Improve notes factory	Grzegorz Bizon	2016-05-29	1	-4/+1
\| \| \|
\| * \|	Add Changelog entry for note validation improvements	Grzegorz Bizon	2016-05-29	1	-0/+1
\| \| \|