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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Repository subnav to 'Find files'dm-tree-blob-blame-consistency	Douwe Maan	2017-05-09	1	-0/+1
\|
*	Make tree, blob and blame pages more consistent	Douwe Maan	2017-05-09	15	-69/+81
\|
*	Merge branch 'fix-main-bundle-sans-vue' into 'master'	Clement Ho	2017-05-09	2	-7/+14
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Prevent vue.esm.js from being bundled into the primary JS bundle Closes #31966 See merge request !11177
\| *	Prevent vue.esm.js from being bundled into the primary JS bundle	Mike Greiling	2017-05-09	2	-7/+14
\|/
*	Merge branch 'fix/gb/make-environment-policy-specs-to-pass-on-ee' into 'master'	Sean McGivern	2017-05-09	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Robustify environment policy specs to pass on EE See merge request !11203
\| *	Robustify environment policy specs to pass on EEfix/gb/make-environment-policy-specs-to-pass-on-ee	Grzegorz Bizon	2017-05-09	1	-1/+1
\| \|
* \|	Merge branch 'tc-fix-snippets-notes-spec' into 'master'	Sean McGivern	2017-05-09	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Fix spec/features/snippets/notes_on_personal_snippets_spec.rb Closes #31993 See merge request !11199
\| *	Fallback to default pattern when note does not belong to projecttc-fix-snippets-notes-spec	Toon Claes	2017-05-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In commit 020295ff a regex was added to quickly determine if mentionables might be referenced. But this didn't take into account the note might not belong to a project. So when it doesn't belong to a project, assume the default issue tracker is used, and use DEFAULT_PATTERN to check if there are mentionables. Fixes gitlab-org/gitlab-ce#31993
* \|	Merge branch 'fix/gb/fix-skipped-manual-actions' into 'master'	Kamil Trzciński	2017-05-09	3	-1/+27
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix skipped manual actions issue in pipeline processing Closes #30212 See merge request !11164
\| * \|	Fix skipped manual actions issue in pipeline processingfix/gb/fix-skipped-manual-actions	Grzegorz Bizon	2017-05-08	3	-1/+27
\| \| \|
* \| \|	Merge branch 'up-arrow-focus-discussion-comment' into 'master'	Filipa Lacerda	2017-05-09	4	-1/+82
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed UP arrow key not editing last comment in discussion Closes #31348 See merge request !11173
\| * \|	Fixed focused test in notes specup-arrow-focus-discussion-comment	Phil Hughes	2017-05-08	1	-1/+1
\| \| \|
\| * \|	Fixed UP arrow key not editing last comment in discussion	Phil Hughes	2017-05-08	4	-1/+82
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #31348
* \| \|	Merge branch 'mrchrisw-fix-slack-notify' into 'master'	Sean McGivern	2017-05-09	3	-2/+18
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notify_only_default_branch check for Slack service See merge request !11154
\| * \| \|	Fix notify_only_default_branch check for Slack servicemrchrisw-fix-slack-notify	Chris Wilson	2017-05-08	3	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The notify_only_default_branch property is using boolean_accessor this means we need to check it using a question methods. Also add specs for disabling this option.
* \| \| \|	Merge branch 'mr-widget-redesign-review' into 'master'	Jacob Schatz	2017-05-09	195	-1557/+7028
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request widget redesign Closes #25424 and #27950 See merge request !10319
\| * \| \| \|	Merge request widget redesign	Fatih Acet	2017-05-09	195	-1557/+7028
\|/ / / /
* \| \| \|	Merge branch 'update-guides-for-9-2' into 'master'	Timothy Andrew	2017-05-08	2	-2/+290
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update guides for 9.2 See merge request !11157
\| * \| \| \|	Update guides for 9.2.	Timothy Andrew	2017-05-08	2	-2/+290
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Update the "Installation from Source" guide - Create an update guide for `9.1` to `9.2`
* \| \| \| \|	Merge branch ↵	Filipa Lacerda	2017-05-08	10	-26/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'28794-standardize-jasmine-test-describe-block-names-that-test-specific-methods' into 'master' Resolve "Standardize jasmine test describe block names that test specific methods" Closes #28794 See merge request !11137
\| * \| \| \| \|	[skip ci] add documentation28794-standardize-jasmine-test-describe-block-names-that-test-specific-methods	Clement Ho	2017-05-05	1	-0/+27
\| \| \| \| \| \|
\| * \| \| \| \|	Standardize jasmine test describe block names that test specific methods	Clement Ho	2017-05-05	9	-26/+26
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' ↵31977-ensure-all-webpack-bundles-which-include-vue-are-children-of-common_vue-js	Dmitriy Zaporozhets	2017-05-08	11	-13/+117
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Use regex to skip unnecessary reference processing in ProcessCommitWorker Closes #28359 See merge request !10867
\| * \| \| \| \| \|	Cycle analytics specs needed Commit to reference issue28359-skip-process-commit-worker-unless-issues-referenced	James Edwards-Jones	2017-05-04	4	-10/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The plan stage both measures time taken and lists related commits. We test for commits being listed, so needed to actually mention the issue in them. An alternative would have been adding “allow_any_instance_of(Commit).to receive(:matches_cross_reference_regex?).and_return(true)” but this felt too coupled to implementation.
\| * \| \| \| \| \|	Use regex to skip unnecessary reference processing in ProcessCommitWorker	James Edwards-Jones	2017-05-04	7	-3/+112
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-notes_on_personal_snippets_spec-timeago-assertion-ce' into ↵	Sean McGivern	2017-05-08	1	-1/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix notes_on_personal_snippets_spec Closes #31938 See merge request !11160
\| * \| \| \| \| \| \|	Just assert the existence of the timeago element	Luke "Jared" Bennett	2017-05-08	1	-4/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Check for all possible timeago strings that can be rendered in a few ↵fix-notes_on_personal_snippets_spec-timeago-assertion-ce	Luke "Jared" Bennett	2017-05-08	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minutes. We cannot rely on 'less than a minute ago'
* \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-05-08	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'Add-index_redirect_routes_path_for_link-migration-to-setup_postgresql' into 'master' Add index_redirect_routes_path_for_link migration to setup_postgresql See merge request !11165
\| * \| \| \| \| \| \| \|	Add index_redirect_routes_path_for_link migration to setup_postgresql.rake	Luke "Jared" Bennett	2017-05-08	1	-0/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'winh-fix-ture-urls' into 'master'	Phil Hughes	2017-05-08	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use absolute URLs for fixtures See merge request !11133
\| * \| \| \| \| \| \| \| \|	Use absolute URLs for fixtures (!11133)winh-fix-ture-urls	winh	2017-05-06	1	-2/+2
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-almost-there-spec-mysql' into 'master'	Sean McGivern	2017-05-08	1	-0/+9
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix sub-second timing comparison error for Devise confirmation period Closes gitlab-ee#2362 See merge request !11156
\| * \| \| \| \| \| \| \| \|	Fix sub-second timing comparison error for Devise confirmation periodsh-fix-almost-there-spec-mysql	Stan Hu	2017-05-07	1	-0/+9
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On databases such as MySQL, it's possible to get into a timing comparison error if the value of `Confirmable#confirmation_sent_at` is within a second of `0.days.ago`. This is possible mostly in specs that test this behavior and most likely not happening in practice. The result of this error causes a user to be deemed active when it should be inactive. To prevent this error, we explicitly check the configuration setting to be `0.days.ago`. Closes gitlab-org/gitlab-ee#2362
* \| \| \| \| \| \| \| \|	Merge branch 'update-templates-for-9-2' into 'master'	Timothy Andrew	2017-05-08	11	-1/+99
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitignore, dockerfile, and license templates for 9.2 See merge request !11158
\| * \| \| \| \| \| \| \| \|	Update gitignore, dockerfile, and license templates for 9.2.update-templates-for-9-2	Timothy Andrew	2017-05-08	11	-1/+99
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'document-foreign-keys' into 'master'	Sean McGivern	2017-05-08	3	-0/+68
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add documentation about adding foreign keys See merge request !11117
\| * \| \| \| \| \| \| \|	Add documentation about adding foreign keys	Yorick Peterse	2017-05-08	3	-0/+68
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'update-deps-licenses-for-9-2' into 'master'	Timothy Andrew	2017-05-08	1	-139/+158
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update the vendor licenses file for 9.2 See merge request !11159
\| * \| \| \| \| \| \|	Update the vendor licenses file for 9.2.update-deps-licenses-for-9-2	Timothy Andrew	2017-05-08	1	-139/+158
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'lm-improve-HA-docs' into 'master'	Sean Packham (GitLab)	2017-05-08	2	-10/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clarify DB/Redis HA docs See merge request !11094
\| * \| \| \| \| \|	clarify DB/Redis HA docslm-improve-HA-docs	Lee Matos	2017-05-04	2	-10/+11
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'docs/new-topic-issues' into 'master'	Sean Packham (GitLab)	2017-05-08	36	-38/+426
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New doc topic: issues Closes #27650 See merge request !11075
\| * \| \| \| \| \|	New doc topic: issues	Marcia Ramos	2017-05-08	36	-38/+426
\|/ / / / / /
* \| \| \| \| \|	Merge branch '21393-allow-deletion-of-protected-branches' into 'master'	Phil Hughes	2017-05-08	21	-142/+375
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add confirm delete protected branch modal Closes #21393 See merge request !11000
\| * \| \| \| \|	Add confirm delete protected branch modal	Sam Rose	2017-05-08	21	-142/+375
\|/ / / / /
* \| \| \| \|	Merge branch 'fix/gl-project-id' into 'master'	James Lopez	2017-05-08	2	-7/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit gl_project_id from Import/Export Closes #29813 See merge request !11032
\| * \| \| \|	remove gl_project_id for I/E version updatefix/gl-project-id	James Lopez	2017-05-02	2	-7/+0
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/support-gitaly-commit-diff-flags' into 'master'	Robert Speicher	2017-05-07	7	-49/+46
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for commit diff ignore_whitespace_change and paths flags Closes gitaly#198 See merge request !11028
\| * \| \| \| \|	Remove stubbing from Gitlab::GitalyClient::Commit specs	Ahmad Sherif	2017-05-07	1	-8/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#198