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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Only new users get marked as external21554-mark-new-user-as-external	Tiago Botelho	2018-01-30	3	-10/+27
\|
*	Merge branch 'default-to-https-for-gravatar-urls' into 'master'	Rémy Coutable	2018-01-25	15	-56/+63
\|\ \| \| \| \| \| \| \| \|	Default to HTTPS for all Gravatar URLs See merge request gitlab-org/gitlab-ce!16666
\| *	Default to HTTPS for all Gravatar URLsdefault-to-https-for-gravatar-urls	Achilleas Pipinellis	2018-01-25	15	-56/+63
\| \| \| \| \| \| \| \| \| \|	If using gravatar.com, both plain_url and ssl_url in settings are now served via HTTPS. Make this the default.
* \|	Merge branch 'qa-deploy-key-scenario' into 'master'	Grzegorz Bizon	2018-01-25	11	-21/+80
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Generate ssh key on the fly for QA See merge request gitlab-org/gitlab-ce!16562
\| * \|	Prefer local variables insteadqa-deploy-key-scenario	Lin Jen-Shin	2018-01-24	1	-4/+4
\| \| \|
\| * \|	Add an test for QA::Runtime::RSAKey	Lin Jen-Shin	2018-01-24	1	-0/+9
\| \| \|
\| * \|	Move initialize method later.	Lin Jen-Shin	2018-01-24	1	-3/+3
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/master' into qa-deploy-key-scenario	Lin Jen-Shin	2018-01-24	356	-4642/+6164
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (106 commits) Remove callback as we already update accordingly on services added missing imports correctly imports performance bar Added imports for dispatcher routes Make the exposing of the Application secret more explicit Add documentation about when the application API was added Add application create API Return a blank JSON response for a missing .js file to prevent Rails CSRF errors add CHANGELOG.md entry for !15804 disable CopyAsGFM on iOS due to bug in webkit Update changelog GitalyClient::ConflictsService#conflicts? should return true for conflicts with missing side Return more consistent values for merge_status on MR API Fix a migration spec messing up the MergeRequestDiff DB schema Backport changes to Gitlab::Checks::ChangeAccess from EE remove webpack bundle tag for monitoring:environments:metrics Set timezone for karma to UTC Upgrade jasmine + raven to newer versions Ensure Gitaly Ruby gems are installed using the correct Gemfile and at the correct location Clarify that a feature that isn't in review by the 1st or 3rd doesn't necessarily miss the freeze ...
\| * \| \|	Also test if the fingerprint is correct	Lin Jen-Shin	2018-01-22	5	-8/+44
\| \| \| \|
\| * \| \|	Merge branch 'qa-deploy-key-factory-product' into qa-deploy-key-scenario	Lin Jen-Shin	2018-01-22	4	-11/+15
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* qa-deploy-key-factory-product: Add .qa-project-deploy-keys to locate it Scrap the deploy key title and match it in test
\| * \| \| \|	Generate ssh key on the fly for QA	Lin Jen-Shin	2018-01-22	6	-13/+27
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fl-more-mr-widget' into 'master'	Phil Hughes	2018-01-25	26	-117/+189
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves status icon into a vue file and adds tests See merge request gitlab-org/gitlab-ce!16703
\| * \| \| \| \|	Update missing pathsfl-more-mr-widget	Filipa Lacerda	2018-01-25	4	-5/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into fl-more-mr-widget	Filipa Lacerda	2018-01-25	122	-592/+1461
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (30 commits) Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service" Update CHANGELOG.md for 10.4.1 Add a gRPC health check to ensure Gitaly is up Add formatted_data attribute to Git::WikiPage Avoid array indices to fixtures in JS specs Migrate .batch_lfs_pointers to Gitaly Updates `Revert this merge request` text Work around a bug in DatabaseCleaner when using the deletion strategy on MySQL Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Workaround a recaptcha pop-up that cannot be tested Moves more mr widget components into vue files Adds i18n Adds better test coverage Execute system hooks after-commit when executing project hooks Remove one Spinach job and add one RSpec job Migrate repository bundling to Gitaly Use limit for search count queries Fix offense in runners settings QA page object class Wait for runner until it registers itself in QA tests Fix static-analysis offenses in QA support class Add specific views / selectors for QA runners page Add views / selectors for pipeline show page object ...
\| * \| \| \| \| \|	Moves status icon into a vue file and adds tests	Filipa Lacerda	2018-01-24	26	-117/+189
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves merging component into a vue file, adds i18n and better test cases
* \| \| \| \| \| \|	Merge branch 'winh-delete-milestone-modal' into 'master'	Phil Hughes	2018-01-25	18	-24/+353
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add modal for deleting a milestone Closes #41314 See merge request gitlab-org/gitlab-ce!16229
\| * \| \| \| \| \| \|	Add modal for deleting a milestonewinh-delete-milestone-modal	Winnie Hellmann	2018-01-25	18	-24/+353
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'revert-9f5390d8' into 'master'	Marin Jankovski	2018-01-25	2	-15/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'" See merge request gitlab-org/gitlab-ce!16707
\| * \| \| \| \| \| \|	Revert "Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'"	Douwe Maan	2018-01-25	2	-15/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !16626
* \| \| \| \| \| \| \|	Merge branch 'revert-430b3f0e' into 'master'	Douwe Maan	2018-01-25	2	-1/+64
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'remove-rugged-walk' into 'master'" See merge request gitlab-org/gitlab-ce!16676
\| * \| \| \| \| \| \|	Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0e	Jacob Vosmaer (GitLab)	2018-01-25	2	-1/+64
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !16525
* \| \| \| \| \| \|	Merge branch 'jej/gitattributes-check-at-ref' into 'master'	Rémy Coutable	2018-01-25	9	-66/+194
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Can parse root .gitattributes file for a ref See merge request gitlab-org/gitlab-ce!16418
\| * \| \| \| \| \| \|	Can parse root .gitattributes file for a refjej/gitattributes-check-at-ref	James Edwards-Jones	2018-01-24	9	-66/+194
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '42285-not-found-status-icon' into 'master'	Phil Hughes	2018-01-25	9	-11/+14
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "generalise not found status icon color throughout application" Closes #42285 See merge request gitlab-org/gitlab-ce!16679
\| * \| \| \| \| \| \| \|	Uses sprite icon to render verified commit badge and uniforms css colors42285-not-found-status-icon	Filipa Lacerda	2018-01-24	9	-11/+14
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '42220-add-pending-empty-state' into 'master'	Tim Zallmann	2018-01-25	6	-7/+13
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add empty state for pending job" Closes #42220 See merge request gitlab-org/gitlab-ce!16646
\| * \| \| \| \| \| \|	Adds correct illustration for pending state42220-add-pending-empty-state	Filipa Lacerda	2018-01-23	6	-7/+13
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'qa/gb/ci-cd-qa-pipelines' into 'master'	Rémy Coutable	2018-01-25	23	-93/+428
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI/CD end-to-end tests Closes gitlab-qa#18 See merge request gitlab-org/gitlab-ce!16619
\| * \| \| \| \| \| \| \|	Fix offense in runners settings QA page object classqa/gb/ci-cd-qa-pipelines	Grzegorz Bizon	2018-01-23	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wait for runner until it registers itself in QA tests	Grzegorz Bizon	2018-01-23	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix static-analysis offenses in QA support class	Grzegorz Bizon	2018-01-23	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add specific views / selectors for QA runners page	Grzegorz Bizon	2018-01-23	2	-4/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' into qa/gb/ci-cd-qa-pipelines	Grzegorz Bizon	2018-01-23	281	-4449/+5509
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (69 commits) Conflicts: qa/qa.rb
\| * \| \| \| \| \| \| \|	Add views / selectors for pipeline show page object	Grzegorz Bizon	2018-01-23	1	-0/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Assert on pipeline jobs statuses in CI/CD QA tests	Grzegorz Bizon	2018-01-23	5	-4/+75
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove blocking wait-time for runner to register in QA	Grzegorz Bizon	2018-01-23	1	-2/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use runner tags when processing CI/CD QA pipelines	Grzegorz Bizon	2018-01-23	2	-2/+16
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor QA instance test scenario and tags	Grzegorz Bizon	2018-01-23	7	-46/+41
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix CI/CD end-to-end tests by waiting for changes	Grzegorz Bizon	2018-01-22	3	-5/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Reduce nesting and simplify CI/CD end-to-end tests	Grzegorz Bizon	2018-01-22	4	-24/+56
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Wait for Runner to register in QA and DRY page objects	Grzegorz Bizon	2018-01-22	4	-10/+19
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add end-to-end test for registering GitLab Runner	Grzegorz Bizon	2018-01-22	9	-16/+166
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add GitLab Runner service to GitLab QA	Grzegorz Bizon	2018-01-22	5	-42/+77
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-01-25	5	-13/+17
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42053-link-to-clusters-in-auto-devops-instead-of-kubernetes-service' into 'master' Link Auto DevOps settings to Clusters page Closes #42053 See merge request gitlab-org/gitlab-ce!16641
\| * \| \| \| \| \| \| \| \|	Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"	Fabio Busatto	2018-01-25	5	-13/+17
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2018-01-25	3	-2/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
\| * \| \| \| \| \| \| \| \|	Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit	Lin Jen-Shin	2018-01-23	3	-2/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	when counting commit count.
* \| \| \| \| \| \| \| \| \|	Merge branch 'fl-mr-widget-refactor' into 'master'	Phil Hughes	2018-01-25	11	-256/+267
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16677
\| * \| \| \| \| \| \| \| \|	Moves more mr widget components into vue filesfl-mr-widget-refactor	Filipa Lacerda	2018-01-24	11	-256/+267
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds i18n Adds better test coverage
* \| \| \| \| \| \| \| \| \|	Merge branch 'sh-add-gitaly-health-check' into 'master'	Robert Speicher	2018-01-25	8	-4/+220
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a gRPC health check to ensure Gitaly is up See merge request gitlab-org/gitlab-ce!16606