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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move flatten.compactgitlab-git-spawn-env	Jacob Vosmaer	2018-01-26	1	-5/+2
\|
*	Set alternate object directories in run_git	Jacob Vosmaer	2018-01-25	3	-20/+35
\|
*	Merge branch '40028-special-characters-on-issuable-templates' into 'master'	Rémy Coutable	2018-01-25	4	-4/+9
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Handling special characters in Issuable Templates Closes #40028 See merge request gitlab-org/gitlab-ce!15323
\| *	Handle special characters on API request of issuable templates	Takuya Noguchi	2018-01-25	4	-4/+9
\| \|
* \|	Merge branch 'contrain-run-git' into 'master'	Rémy Coutable	2018-01-25	2	-83/+97
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Make Gitlab::Git::Repository#run_git private See merge request gitlab-org/gitlab-ce!16622
\| * \|	Make Gitlab::Git::Repository#run_git privatecontrain-run-git	Jacob Vosmaer	2018-01-25	2	-83/+97
\| \| \|
* \| \|	Merge branch 'feat/add-section-headers-to-project-repo-buttons' into 'master'	Rémy Coutable	2018-01-25	4	-13/+22
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve empty project overview See merge request gitlab-org/gitlab-ce!16617
\| * \| \|	Improve empty project overview	George Tsiolis	2018-01-25	4	-13/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add section headers to project repo buttons - Add primary button to content to add file when the repository is empty - Change project removal primary button from project overview to secondary button - Update headings for better alignment - Add primary button for readme only user preference
* \| \| \|	Merge branch 'update-secret-values-to-support-dynamic-elements' into 'master'	Filipa Lacerda	2018-01-25	4	-26/+117
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update secret_values to support dynamic elements within parent See merge request gitlab-org/gitlab-ce!16665
\| * \| \| \|	Update secret_values to support dynamic elements within parentupdate-secret-values-to-support-dynamic-elements	Eric Eastwood	2018-01-24	4	-26/+117
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Used in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110 which introduces a dynamic variable list and needs secrets. We use the valueSelector/placeholderSelector options to avoid selecting the last empty row.
* \| \| \|	Merge branch '42385-enable-the-rspec-singlelinehook-cop' into 'master'	Robert Speicher	2018-01-25	2	-5/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Re-enable the `RSpec/SingleLineHook` cop" Closes #42385 See merge request gitlab-org/gitlab-ce!16704
\| * \| \| \|	Update gitlab-styles and re-enable the RSpec/SingleLineHook cop again42385-enable-the-rspec-singlelinehook-cop	Rémy Coutable	2018-01-25	2	-5/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Merge branch 'profile-link-target-blank' into 'master'	Rémy Coutable	2018-01-25	1	-3/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Open links in a new tab on the user page See merge request gitlab-org/gitlab-ce!16705
\| * \| \| \|	Open links in a new tab on the user page	Achilleas Pipinellis	2018-01-25	1	-3/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/batch-lfs-pointers-accepting-lazy-enum' into 'master'	Grzegorz Bizon	2018-01-25	3	-3/+18
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix .batch_lfs_pointers accepting a lazy enumerator See merge request gitlab-org/gitlab-ce!16701
\| * \| \| \| \|	Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enum	Ahmad Sherif	2018-01-25	3	-3/+18
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gitaly-repo-exists' into 'master'	Douwe Maan	2018-01-25	2	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Gitaly RepositoryExists opt-out See merge request gitlab-org/gitlab-ce!16680
\| * \| \| \| \| \|	Make Gitaly RepositoryExists opt-out	Jacob Vosmaer (GitLab)	2018-01-25	2	-1/+6
\|/ / / / / /
* \| \| \| \| \|	Merge branch '42377-fix-merge-request-can-be-reverted' into 'master'	Rémy Coutable	2018-01-25	2	-3/+19
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Look at system notes created just before merge as well as after, when deciding if an MR can be reverted Closes #42377 See merge request gitlab-org/gitlab-ce!16678
\| * \| \| \| \| \|	Look at notes created just before merge when deciding if an MR can be reverted	Nick Thomas	2018-01-25	2	-3/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On MySQL, at least, `Note#created_at` doesn't seem to store fractional seconds, while `MergeRequest::Metrics#merged_at` does. This breaks the optimization assumption that we only need to search for notes created after the MR has been merged. Unsynchronized system clocks also make this a dangerous assumption to make. Adding a minute of leeway still optimizes away most notes, but allows both cases to be handled more gracefully. If the system clocks are more than a minute out, we'll still be broken, of course.
* \| \| \| \| \| \|	Merge branch 'ux-guide-deprecation' into 'master'	Jacob Schatz	2018-01-25	2	-0/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add note within ux documentation that further changes should be made within the… See merge request gitlab-org/gitlab-ce!16686
\| * \| \| \| \| \| \|	Add note within ux documentation that further changes should be made within ↵ux-guide-deprecation	tauriedavis	2018-01-24	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the design.gitlab project
* \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \| \| \|