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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Generalize toggle_buttons.jsgeneralize-js-toggle-buttons	Eric Eastwood	2018-01-26	12	-155/+225
\| \| \| \|	Part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4110
*	Merge branch 'fix-local-rspec-tests' into 'master'	Mike Greiling	2018-01-26	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix local RSpec tests due to bug in `webpack_bundle_tag` Closes #42368 See merge request gitlab-org/gitlab-ce!16724
\| *	fix bug in webpack_helper in which force_same_domain argument was ignored ↵fix-local-rspec-tests	Mike Greiling	2018-01-25	1	-1/+1
\| \| \| \| \| \| \| \|	breaking local rspec tests
* \|	Merge branch 'fix/rubocop-offenses-in-repo-spec' into 'master'	Robert Speicher	2018-01-25	1	-2/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix rubocop offenses introduced in !16623 See merge request gitlab-org/gitlab-ce!16722
\| * \|	Fix rubocop offenses introduced in !16623	Ahmad Sherif	2018-01-25	1	-2/+7
\| \| \|
* \| \|	Merge branch 'update-node-docs' into 'master'	Jacob Schatz	2018-01-25	3	-8/+11
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix documentation about node version Closes #41438 See merge request gitlab-org/gitlab-ce!16720
\| * \|	fix documentation about node version	Tobias Gurtzick	2018-01-25	3	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \|	Resolves #41438
* \| \|	Merge branch 'feature/migrate-repo-restorer-to-gitaly' into 'master'	Robert Speicher	2018-01-25	9	-11/+80
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate restoring repo from bundle to Gitaly Closes gitaly#946 See merge request gitlab-org/gitlab-ce!16623
\| * \| \|	Migrate restoring repo from bundle to Gitalyfeature/migrate-repo-restorer-to-gitaly	Ahmad Sherif	2018-01-24	9	-11/+80
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#946
* \| \| \|	Merge branch '34952-only-tags-is-not-taken-in-account-in-the-cache-gems-job' ↵	Robert Speicher	2018-01-25	1	-2/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "`only: - tags` is not taken in account in the `cache gems` job" Closes #34952 See merge request gitlab-org/gitlab-ce!16721
\| * \| \| \|	Ensure the job also run for tags	Rémy Coutable	2018-01-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'move-users-spinach-tests-to-rspec' into 'master'	Robert Speicher	2018-01-25	3	-124/+107
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move user page spinach tests to RSpec See merge request gitlab-org/gitlab-ce!16598
\| * \| \| \| \|	Move user page spinach tests to RSpec	Semyon Pupkov	2018-01-25	3	-124/+107
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
* \| \| \| \| \|	Merge branch '42338-rubocop-cache' into 'master'	Robert Speicher	2018-01-25	2	-1/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cache rubocop cache for CI Closes #42338 See merge request gitlab-org/gitlab-ce!16700
\| * \| \| \| \| \|	Cache rubocop cache for CI42338-rubocop-cache	Lin Jen-Shin	2018-01-25	2	-1/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'katex-throwOnError' into 'master'	Filipa Lacerda	2018-01-25	2	-1/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable throwOnError in KaTeX to reveal user where is the problem See merge request gitlab-org/gitlab-ce!16684
\| * \| \| \| \| \|	Disable throwOnError in KaTeX to reveal user where is the problem	Jakub Jirutka	2018-01-24	2	-1/+6
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From KaTeX documentation: > throwOnError: boolean. If true, KaTeX will throw a ParseError when > it encounters an unsupported command. If false, KaTeX will render > the unsupported command as text in the color given by errorColor. > (default: true) It's better to render the formula and highlight unsupported commands than just give up and render whole formula as a code; users are confused and don't know what's wrong.
* \| \| \| \| \|	Merge branch 'lint-rugged' into 'master'	Rémy Coutable	2018-01-25	13	-73/+75
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a lint check to restrict use of Rugged See merge request gitlab-org/gitlab-ce!16656
\| * \| \| \| \| \|	Look for rugged with static analysislint-rugged	Jacob Vosmaer	2018-01-25	13	-73/+75
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	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