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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update pipeline status badge details docsdocs/gb/update-pipeline-badge-docs	Grzegorz Bizon	2017-11-20	2	-2/+4
\|
*	Merge branch 'fix-conflict-highlighting' into 'master'	Douwe Maan	2017-11-20	3	-4/+11
\|\ \| \| \| \| \| \| \| \|	Fix conflict highlighting See merge request gitlab-org/gitlab-ce!15463
\| *	Fix conflict highlightingfix-conflict-highlighting	Sean McGivern	2017-11-17	3	-4/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts used to take a `Repository` and pass that to `Gitlab::Highlight.highlight`, which would call `#gitattribute` on the repository. Now they use a `Gitlab::Git::Repository`, which didn't have that method defined - but defining it on `Gitlab::Git::Repository` does make it available on `Repository` through `method_missing`, so we can do that and both cases will work.
* \|	Merge branch '39727-axios-all-the-things' into 'master'	Phil Hughes	2017-11-20	12	-162/+128
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Use axios instead of vue resource - step 1 See merge request gitlab-org/gitlab-ce!15339
\| * \|	Use axios instead of vue resource - step 1	Filipa Lacerda	2017-11-20	12	-162/+128
\|/ /
* \|	Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'	Rémy Coutable	2017-11-20	113	-0/+410
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds Rubocop rule for line break after guard clause Closes #18040 See merge request gitlab-org/gitlab-ce!15188
\| * \|	Adds Rubocop rule for line break after guard clause	Jacopo	2017-11-16	113	-0/+410
\| \| \| \| \| \| \| \| \| \| \| \|	Adds a rubocop rule (with autocorrect) to ensure line break after guard clauses.
* \| \|	Merge branch 'docs/fix-broken-anchor' into 'master'	Achilleas Pipinellis	2017-11-20	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a wrong anchor to job permissions doc See merge request gitlab-org/gitlab-ce!15478
\| * \| \|	Fix a wrong anchor to job permissions docdocs/fix-broken-anchor	Rémy Coutable	2017-11-20	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch '40016-log-header' into 'master'	Phil Hughes	2017-11-20	3	-8/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hide log size in mobile Closes #40016 See merge request gitlab-org/gitlab-ce!15431
\| * \| \| \|	Hide log size in mobile	Filipa Lacerda	2017-11-20	3	-8/+14
\|/ / / /
* \| \| \|	Merge branch ↵	Rémy Coutable	2017-11-20	2	-7/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40300-cannot-list-tags-in-a-repository-mirror-when-hashed-storage-in-use' into 'master' Fix Gitlab::Git::Repository#remote_tags using unexisting variable Closes #40300 See merge request gitlab-org/gitlab-ce!15466
\| * \| \| \|	Fix Gitlab::Git::Repository#remote_tags using unexisting variable	Alejandro Rodríguez	2017-11-20	2	-7/+20
\|/ / / /
* \| \| \|	Merge branch 'sh-document-strace-unicorn' into 'master'	Achilleas Pipinellis	2017-11-20	1	-0/+28
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	Document how to troubleshoot internal API calls See merge request gitlab-org/gitlab-ce!15337
\| * \| \|	Document how to troubleshoot internal API calls	Stan Hu	2017-11-18	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] iFoo
* \| \| \|	Merge branch 'rs-cycle-analytics-seed' into 'master'	Rémy Coutable	2017-11-20	1	-37/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update CycleAnalytics seed to account for multiple issue assignees Closes #40245 See merge request gitlab-org/gitlab-ce!15435
\| * \| \| \|	Update CycleAnalytics seed to account for multiple issue assigneesrs-cycle-analytics-seed	Robert Speicher	2017-11-16	1	-37/+48
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-remove-docs-executable' into 'master'	Achilleas Pipinellis	2017-11-18	4	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove executable bit from images for docs lint See merge request gitlab-org/gitlab-ce!15468
\| * \| \| \| \|	Remove executable bit from images for docs lintsh-remove-docs-executable	Stan Hu	2017-11-17	4	-0/+0
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	This was causing a docs lint failure in https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/40901316.
* \| \| \| \|	Merge branch 'docs-link-subgroups-api-mr' into 'master'	Achilleas Pipinellis	2017-11-18	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document when Groups API `/subgroups` endpoint introduced Closes #40247 See merge request gitlab-org/gitlab-ce!15453
\| * \| \| \|	Document when Groups API `/subgroups` endpoint introduced	Mark Fletcher	2017-11-17	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge branch 'mk-bandaid-db-rollback-failures' into 'master'	Robert Speicher	2017-11-17	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rollback to a safer place to stop See merge request gitlab-org/gitlab-ce!15465
\| * \| \| \| \|	Rollback to a safer place to stop	Michael Kozono	2017-11-17	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch '4056-hashed-storage-upload-transfers' into 'master'	Stan Hu	2017-11-17	1	-1/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project transfer with hashed-storage attachments Closes gitlab-ee#4056 See merge request gitlab-org/gitlab-ce!15457
\| * \| \| \| \|	Fix project transfer with hashed-storage attachments	Nick Thomas	2017-11-17	1	-1/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'restrict-update-column-in-batches-for-large-tables' into 'master'	Robert Speicher	2017-11-17	31	-67/+153
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict update column in batches for large tables See merge request gitlab-org/gitlab-ce!15458
\| * \| \| \| \| \|	Add computed update docs for update_column_in_batches	Sean McGivern	2017-11-17	2	-1/+46
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Prevent update_column_in_batches on large tables	Sean McGivern	2017-11-17	29	-66/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add_column_with_default is implemented in terms of update_column_in_batches, but update_column_in_batches can be used independently. Neither of these should be used on the specified large tables, because they will cause issues on large instances like GitLab.com. This also ignores the cop for all existing migrations, renaming AddColumnWithDefaultToLargeTable where appropriate.
* \| \| \| \| \| \|	Merge branch 'improved-changes-dropdown' into 'master'	Filipa Lacerda	2017-11-17	6	-11/+46
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved the design of the changed files dropdown Closes #36687 See merge request gitlab-org/gitlab-ce!15367
\| * \| \| \| \| \| \|	moved magic number into variablesimproved-changes-dropdown	Phil Hughes	2017-11-17	1	-1/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	changed text color of path	Phil Hughes	2017-11-17	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	updated dropdown width	Phil Hughes	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	updated to use new sprite icons	Phil Hughes	2017-11-17	3	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improved the design of the changed files dropdown	Phil Hughes	2017-11-17	4	-8/+39
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #36687
* \| \| \| \| \| \|	Merge branch 'qa/gb/fix-subject-address-in-factories' into 'master'	Robert Speicher	2017-11-17	2	-0/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix QA test subject address by configuring capybara Closes gitlab-qa#113 See merge request gitlab-org/gitlab-ce!15446
\| * \| \| \| \| \| \|	Fix QA test subject address by configuring capybaraqa/gb/fix-subject-address-in-factories	Grzegorz Bizon	2017-11-17	2	-0/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'bvl-fix-count-with-selects' into 'master'	Douwe Maan	2017-11-17	3	-1/+20
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the selects when counting the last page Closes #40266 See merge request gitlab-org/gitlab-ce!15456
\| * \| \| \| \| \| \|	Remove the selects when counting the last page	Bob Van Landuyt	2017-11-17	3	-1/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The last page of the first collection is only loaded into memory when it is being viewed. If it isn't loaded into memory, the `#size` call triggers a count query. This `#count` would generate an invalid query if our custom preloaded counts are included by adding a separate `as count_column` alias on top of the count aliases. Removing the selects in this case will make sure a valid `COUNT(*)` is generated.
* \| \| \| \| \| \| \|	Merge branch 'mk-add-user-rate-limits' into 'master'	Douwe Maan	2017-11-17	17	-140/+984
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add request rate limits Closes #30053 See merge request gitlab-org/gitlab-ce!14708
\| * \| \| \| \| \| \| \|	Renaming AuthenticationException to AuthenticationErrormk-add-user-rate-limits	Francisco Lopez	2017-11-17	3	-10/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changes after rebase	Francisco Lopez	2017-11-17	2	-23/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removing Offender	Francisco Lopez	2017-11-17	1	-1/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Moved Exceptions to Gitlab::Auth	Francisco Lopez	2017-11-17	8	-48/+51
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Moving exceptions to UserAuthFinders	Francisco Lopez	2017-11-17	6	-49/+52
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Leaving atom? query to fix tests	Francisco Lopez	2017-11-17	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Change the rss url guard clause	Francisco Lopez	2017-11-17	2	-6/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added some more comments	Francisco Lopez	2017-11-17	4	-15/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Removed method handle_return_value	Francisco Lopez	2017-11-17	1	-13/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added UserAuthFinders spec	Francisco Lopez	2017-11-17	2	-2/+196
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added RequestAuthenticator spec	Francisco Lopez	2017-11-17	1	-0/+67
\| \| \| \| \| \| \| \| \|