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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| * \| \| \| \|	Re-enable Gitaly commit_raw_diff feature	Ahmad Sherif	2017-05-07	6	-41/+43
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-58d1cd6b' into 'master'	Stan Hu	2017-05-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" See merge request !11153
\| * \| \| \| \| \|	Revert "Merge branch ↵revert-58d1cd6b	Stan Hu	2017-05-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix-rspec_profiling-establish_connection-string-deprecation' into 'master'" This reverts merge request !11150
* \| \| \| \| \| \|	Merge branch 'zj-better-view-pipeline-schedule' into 'master'	Kamil Trzciński	2017-05-07	83	-413/+1841
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Pipeline Schedules that supersedes experimental Trigger Schedule Closes #30882 See merge request !10853
\| * \| \| \| \| \|	Add Pipeline Schedules that supersedes experimental Trigger Schedule	Zeger-Jan van de Weg	2017-05-07	83	-413/+1841
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'another-attempt-at-access_control_ce_spec-transient-failure' ↵	Stan Hu	2017-05-07	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Another attempt at access_control_ce_spec Closes #31827 See merge request !11123
\| * \| \| \| \| \|	Another attempt at access_control_ce_specanother-attempt-at-access_control_ce_spec-transient-failure	Luke "Jared" Bennett	2017-05-05	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-rspec_profiling-establish_connection-string-deprecation' ↵	Stan Hu	2017-05-07	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection call … See merge request !11150
\| * \| \| \| \| \| \|	Cast ENV['RSPEC_PROFILING_POSTGRES_URL'] to symbol in establish_connection ↵fix-rspec_profiling-establish_connection-string-deprecation	Luke "Jared" Bennett	2017-05-07	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	call of rspec_profiling.rb
* \| \| \| \| \| \|	Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master'	Stan Hu	2017-05-07	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly stub application settings in signup_spec.rb See merge request !11151
\| * \| \| \| \| \| \|	Correctly stub application settings in signup_spec.rbcorrectly-stub-application-settings-in_signup_spec	Luke "Jared" Bennett	2017-05-07	1	-2/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch '25226-realtime-pipelines-fe' into 'master'	Kamil Trzciński	2017-05-07	42	-360/+1377
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rewrite Pipeline Graph in Vue.js to allow realtime Closes #25226 and #31557 See merge request !10878
\| * \| \| \| \| \|	Fix test\|25226-realtime-pipelines-fe	Z.J. van de Weg	2017-05-07	1	-3/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Make test that actually displays pipeline graph	Kamil Trzcinski	2017-05-07	2	-67/+54
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Move file loading to the top of the file	Filipa Lacerda	2017-05-06	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Adds missing CSS class	Filipa Lacerda	2017-05-06	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' into 25226-realtime-pipelines-fe	Filipa Lacerda	2017-05-06	53	-187/+772
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (40 commits) Use GitLab Pages v0.4.2 Do not reprocess actions when user retries pipeline Add specs for extended status for manual actions Refine inheritance model of extended CI/CD statuses Introduce generic manual action extended status class Check ability to update build on the API resource Require build to be present in the controller Authorize build update on per object basis Use update build policy instead of new play policy Improve environment policy class Rephrase documentation for protected actions feature Improve code style related to protected actions Add changelog entry for external env URL btn fix Hide environment external URL button if not defined Fix builds controller spec related to protected actions Fix environment policy class name in specs Add Changelog entry for protected manual actions Document protected manual actions feature Improve specs for jobs API regarding manual actions Fix Rubocop offense in environments policy class ...
* \| \| \| \| \| \|	Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ↵	Kamil Trzciński	2017-05-06	49	-184/+732
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Check access to a branch when user triggers manual action Closes #20261 See merge request !10494
\| * \| \| \| \| \| \|	Do not reprocess actions when user retries pipelinefeature/gb/manual-actions-protected-branches-permissions	Grzegorz Bizon	2017-05-05	2	-1/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User who is not allowed to trigger manual actions should not be allowed to reprocess / retrigger / retry these actions.
\| * \| \| \| \| \| \|	Add specs for extended status for manual actions	Grzegorz Bizon	2017-05-05	1	-0/+56
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Refine inheritance model of extended CI/CD statuses	Grzegorz Bizon	2017-05-05	11	-38/+18
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Introduce generic manual action extended status class	Grzegorz Bizon	2017-05-05	5	-43/+57
\| \| \| \| \| \| \| \|