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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into zj-project-templates	Filipa Lacerda	2017-08-07	1289	-4469/+9612
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (623 commits) Fix issues with pdf-js dependencies fix missing changelog entries for security release on 2017-01-23 Update top bar issues icon Fix pipeline icon in contextual nav for projects Since mysql is not a priority anymore, test it less Fix order of CI lint ace editor loading Add container registry and spam logs icons Fix different Markdown styles Backport to CE for: Make new dropdown dividers full width Fix spec Fix spec Fix spec Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs Add changelog Install yarn via apt in update guides Use long curl options fix Add a spec for concurrent process Remove monkey-patched Array.prototype.first() and last() methods ...
\| *	Fix issues with pdf-js dependencies	Mike Greiling	2017-08-07	2	-4/+4
\| \|
\| *	Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'	Tim Zallmann	2017-08-06	1	-4/+34
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Timezone Inconsistencies in User Contribution Calendar Closes #27616 and #1943 See merge request !13208
\| \| *	add tests for proper timezone date grouping within ContributionsCalendar	Mike Greiling	2017-07-31	1	-4/+34
\| \| \|
\| * \|	Merge branch 'fix/sm/34547-cannot-connect-to-ci-server-error-messages' into ↵	Sean McGivern	2017-08-04	1	-27/+70
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Fix "Cannot connect to CI server error messages" Closes #34547 See merge request !13252
\| \| * \|	Fix specfix/sm/34547-cannot-connect-to-ci-server-error-messages	Shinya Maeda	2017-08-04	1	-2/+2
\| \| \| \|
\| \| * \|	Fix spec	Shinya Maeda	2017-08-04	1	-1/+3
\| \| \| \|
\| \| * \|	Add a spec for concurrent process	Shinya Maeda	2017-08-04	1	-27/+68
\| \| \| \|
\| * \| \|	Merge branch ↵	Sean McGivern	2017-08-04	1	-0/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'fix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at' into 'master' Fix "pipeline_schedules pages throwing error 500" when "Active Ci::PipelineSchedule have a nullified `next_run_at`" Closes #32790 See merge request !13286
\| \| * \| \|	Fix specfix/sm/35931-active-ci-pipelineschedule-have-nullified-next_run_at	Shinya Maeda	2017-08-04	1	-7/+3
\| \| \| \| \|
\| \| * \| \|	fix	Shinya Maeda	2017-08-04	1	-0/+23
\| \| \|/ /
\| * \| \|	Merge branch '34060-simplified-general-project-settings' into 'master'	Mike Greiling	2017-08-04	3	-12/+41
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	34060 Simply general project settings to use expanded panels Closes #34060 See merge request !12620
\| \| * \| \|	fixed up specs	Phil Hughes	2017-07-28	1	-6/+14
\| \| \| \| \|
\| \| * \| \|	trying to fix tests	tauriedavis	2017-07-28	1	-1/+12
\| \| \| \| \|
\| \| * \| \|	try and fix some tests	tauriedavis	2017-07-28	2	-5/+15
\| \| \| \| \|
\| * \| \| \|	Merge branch 'tc-fix-mr-query-params' into 'master'	Rémy Coutable	2017-08-04	1	-0/+20
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spec to test combining API merge_requests query parameters See merge request !11172
\| \| * \| \| \|	Add spec to test combining API merge_requests query parameters	Toon Claes	2017-08-03	1	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To investigate gitlab-org/gitlab-ce#31599
\| * \| \| \| \|	Merge branch '2902-standalone-ee-dir-ce' into 'master'	Rémy Coutable	2017-08-04	1	-8/+10
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Move EE-specific files to a standalone directory Closes gitlab-ee#3097 See merge request !13311
\| \| * \| \| \| \|	Backport to CE for:2902-standalone-ee-dir-ce	Lin Jen-Shin	2017-08-04	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2483
\| * \| \| \| \| \|	Merge branch 'revert-6291bc8c' into 'master'	Rémy Coutable	2017-08-04	1	-1/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'" See merge request !13292
\| \| * \| \| \| \| \|	Revert "Merge branch 'rs-warm-capybara-only-in-ci' into 'master'"revert-6291bc8c	Robert Speicher	2017-08-03	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12761
\| * \| \| \| \| \| \|	Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'	Robert Speicher	2017-08-04	1	-10/+30
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#last_commit_for_path to Gitaly Closes gitaly#433 See merge request !13200
\| \| * \| \| \| \| \| \|	Migrate Repository#last_commit_for_path to Gitaly	Ahmad Sherif	2017-08-03	1	-10/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#433
\| * \| \| \| \| \| \| \|	Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'	Robert Speicher	2017-08-04	1	-46/+56
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate blame loading to Gitaly Closes gitaly#421 See merge request !13155
\| \| * \| \| \| \| \| \|	Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitaly	Ahmad Sherif	2017-08-03	1	-46/+56
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#421
\| * \| \| \| \| \| \|	Merge branch 'rs-issue-35701' into 'master'	Rémy Coutable	2017-08-04	1	-0/+2
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure DeviseHelpers is loaded before inclusion in LoginHelpers Closes #35701 See merge request !13261
\| \| * \| \| \| \| \| \|	Ensure DeviseHelpers is loaded before inclusion in LoginHelpersrs-issue-35701	Robert Speicher	2017-08-03	1	-0/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'refactor.notification-recipient-builders' into 'master'	Sean McGivern	2017-08-04	2	-34/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor.notification recipient builders See merge request !13197
\| \| * \| \| \| \| \| \| \|	rm a now-useless spec	http://jneen.net/	2017-08-03	1	-34/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	add builder helpers with levels and start to separate out #filter!	http://jneen.net/	2017-08-03	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'fix-jira-integration' into 'master'	Rémy Coutable	2017-08-04	1	-0/+9
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it See merge request !13240
\| \| * \| \| \| \| \| \| \| \|	Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it	Mehdi Lahmam	2017-08-03	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove monkey-patched Array.prototype.first() and last() methods	Mike Greiling	2017-08-04	7	-30/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'diff-changed-files-dropdown' into 'master'	Filipa Lacerda	2017-08-04	1	-0/+52
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved changed files into a dropdown Closes #29778 See merge request !13128
\| \| * \| \| \| \| \| \| \| \|	fixed jumping when bar gets stuck	Phil Hughes	2017-08-03	1	-0/+52
\| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added specs to sticky util file added `No files found.` text when results are empty
\| * \| \| \| \| \| \| \| \|	Resolve "Specific Async Script Loading by using a Page Variable"	Tim Zallmann	2017-08-03	1	-0/+13
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'tc-no-todo-service-select-mysql' into 'master'	Sean McGivern	2017-08-03	1	-5/+28
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid plucking Todo ids in TodoService - take 2 See merge request !11415
\| \| * \| \| \| \| \| \| \|	Avoid plucking Todo ids and use sub-queries instead	Toon Claes	2017-08-03	1	-5/+28
\| \| \| \|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	TodoService should not call `.select(&:id)` on todos, because this is bad performance. So instead use sub-queries, which will result in a single SQL query to the database. https://docs.gitlab.com/ee/development/sql.html#plucking-ids
\| * \| \| \| \| \| \| \|	fix #3686 make tarball download url to end with extension	haseeb	2017-08-03	2	-4/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'use-rspec-support-helper' into 'master'	Rémy Coutable	2017-08-03	14	-51/+15
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't include EmailHelpers manually, pick with rspec See merge request !13257
\| \| * \| \| \| \| \| \| \|	Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helper	Lin Jen-Shin	2017-08-03	14	-51/+15
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
\| * \| \| \| \| \| \| \|	fix #35133 strip new lines from ssh keys	haseeb	2017-08-03	1	-6/+8
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-oauth-checkboxes' into 'master'	Filipa Lacerda	2017-08-03	1	-0/+8
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed sign-in restrictions buttons not toggling active state Closes #35882 See merge request !13270
\| \| * \| \| \| \| \|	Fixed sign-in restrictions buttons not toggling active statefix-oauth-checkboxes	Phil Hughes	2017-08-03	1	-0/+8
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #35882
\| * \| \| \| \| \|	Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'	Robert Speicher	2017-08-03	1	-17/+27
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Gitlab::Git::Repository#count_commits to Gitaly Closes gitaly#415 See merge request !13121
\| \| * \| \| \| \| \|	Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitaly	Ahmad Sherif	2017-08-02	1	-17/+27
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#415
\| * \| \| \| \| \|	Merge branch 'merge-request-commits-background-migration' into 'master'	Rémy Coutable	2017-08-03	2	-0/+247
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request commits background migration See merge request !12685
\| \| * \| \| \| \|	Migrate MR commits and diffs to new tablesmerge-request-commits-background-migration	Sean McGivern	2017-08-03	2	-0/+247
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, we stored these as serialised fields - `st_{commits,diffs}` - on the `merge_request_diffs` table. These now have their own tables - `merge_request_diff_{commits,diffs}` - with a column for each attribute of the serialised data. Add a background migration to go through the existing MR diffs and migrate them to the new format. Ignore any contents that cannot be displayed. Assuming that we have 5 million rows to migrate, and each batch of 2,500 rows can be completed in 5 minutes, this will take about 7 days to migrate everything.
\| * \| \| \| \| \|	Merge branch '28472-ignore-auto-generated-mails' into 'master'	Sean McGivern	2017-08-03	4	-23/+34
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't send rejection mails for all auto-generated mails Closes #28472 See merge request !13254
\| \| * \| \| \| \| \|	Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mails	Lin Jen-Shin	2017-08-03	4	-23/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also make it easier to have mailer helper