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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Do not show MR Popover if all necessary data is not present60540-merge-request-popover-is-not-working-on-the-to-do-page	Sam Bigelow	2019-04-17	2	-9/+26
\|
*	Make sure to allow project information data tags on GFM	Sam Bigelow	2019-04-17	3	-1/+27
\|
*	Merge branch 'zj-fsck-no-timeout' into 'master'	Nick Thomas	2019-04-15	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Git FSCK has no timeout Closes #53319 See merge request gitlab-org/gitlab-ce!27299
\| *	Git FSCK has no timeoutzj-fsck-no-timeout	Zeger-Jan van de Weg	2019-04-15	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	FSCK is usually called through sidekiq, but a rake task doesn't have a mechanism to default to no timeout for this RPC. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53319
* \|	Merge branch 'prometheus-api-var-subst' into 'master'	Sean McGivern	2019-04-15	2	-3/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add variable substitution in prometheus proxy API See merge request gitlab-org/gitlab-ce!27226
\| * \|	Add ability to do variable substitution	Reuben Pereira	2019-04-15	2	-3/+59
\|/ / \| \| \| \| \| \| \| \| \| \|	- In prometheus proxy api, allow variables to be replaced. For example, if 'up{env="%{ci_environment_slug}"}' is passed to the endpoint, it becomes 'up{env="production"}' before being sent to prometheus.
* \|	Merge branch 'refactor-gitlab-ci-yml' into 'master'	Rémy Coutable	2019-04-15	12	-1150/+1159
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Split `.gitlab-ci.yml` into multiple includes Closes #58521 See merge request gitlab-org/gitlab-ce!27116
\| * \|	Refactor .gitlab-ci.yml	Kamil Trzciński	2019-04-15	12	-1150/+1159
\| \| \|
* \| \|	Merge branch 'sh-validate-ref-name-in-commit' into 'master'	Rémy Coutable	2019-04-15	4	-0/+58
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Validate refs used in controllers don't have spaces Closes #58572 and gitaly#1425 See merge request gitlab-org/gitlab-ce!24037
\| * \| \|	Validate refs used in controllers don't have spacessh-validate-ref-name-in-commit	Stan Hu	2019-04-14	4	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This avoids an unnecessary call to Gitaly and reduces gRPC errors. * Closes https://gitlab.com/gitlab-org/gitaly/issues/1425 * Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/58572
* \| \| \|	Merge branch 'feature/add_write_repository_scope' into 'master'	James Lopez	2019-04-15	13	-43/+152
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added write_repository scope for personal access token Closes #58847 and #51709 See merge request gitlab-org/gitlab-ce!26021
\| * \| \| \|	Added write_repository scope for personal access token	Horatiu Eugen Vlad	2019-04-15	13	-43/+152
\|/ / / /
* \| \| \|	Merge branch 'docs-pages-intro-refactor' into 'master'	Achilleas Pipinellis	2019-04-15	1	-43/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: reorg Pages index See merge request gitlab-org/gitlab-ce!27319
\| * \| \| \|	Docs: reorg Pages index	Marcia Ramos	2019-04-15	1	-43/+39
\|/ / / /
* \| \| \|	Merge branch 'mw-i18n-app-helpers-services' into 'master'	Lin Jen-Shin	2019-04-15	16	-61/+213
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings in app/services and app/helpers See merge request gitlab-org/gitlab-ce!27220
\| * \| \| \|	Externalize strings detected by rubocop-i18n	Martin Wortschack	2019-04-15	16	-61/+213
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Externalize strings in milestones_helper - Externalize strings in app/services - Update PO file
* \| \| \|	Merge branch 'cherry-pick-39eb16aa' into 'master'	Sean McGivern	2019-04-15	18	-53/+67
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pick revert of `require-all-templates-to-include-default-stages' Closes #59992 and #60106 See merge request gitlab-org/gitlab-ce!27312
\| * \| \|	Un-quarantine speccherry-pick-39eb16aa	Kamil Trzciński	2019-04-15	1	-3/+3
\| \| \| \|
\| * \| \|	Merge branch 'require-all-templates-to-include-default-stages' into 'master'	Sean McGivern	2019-04-15	18	-50/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Require all templates to use default stages Closes #59992 See merge request gitlab-org/gitlab-ce!26954 (cherry picked from commit 39eb16aab2dbac3347f61f83fb60f5448d44e965) e0df05cf Require all templates to use default stages
* \| \| \|	Merge branch 'ce-issue_6538' into 'master'	Robert Speicher	2019-04-15	2	-0/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Extract EE specific files/lines for spec/features/issues See merge request gitlab-org/gitlab-ce!26740
\| * \| \| \|	Extract EE specific files/lines for spec/features/issues	Felipe Artur	2019-04-15	2	-0/+4
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Part of moving gitlab into single codebase
* \| \| \|	Merge branch 'bvl-new-translations-ce' into 'master'	Rémy Coutable	2019-04-15	45	-11268/+126401
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add translations from Crowdin See merge request gitlab-org/gitlab-ce!27347
\| * \| \| \|	Add translations from Crowdin	GitLab Crowdin Bot	2019-04-13	45	-11268/+126401
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch '59873-page-title' into 'master'	Phil Hughes	2019-04-15	11	-13/+10
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes stylelint for page_title.scss Closes #59873 See merge request gitlab-org/gitlab-ce!27315
\| * \| \|	Fixes stylelint for page_title.scss59873-page-title	Filipa Lacerda	2019-04-12	11	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces CSS with BS4 Utility classes
* \| \| \|	Merge branch 'frozen-string-spec-some' into 'master'	Rémy Coutable	2019-04-15	154	-4/+313
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add some frozen string to spec/*/.rb See merge request gitlab-org/gitlab-ce!27341
\| * \| \| \|	Add some frozen string to spec/*/.rb	gfyoung	2019-04-15	154	-4/+313
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds frozen string to the following: * spec/bin/*/.rb * spec/config/*/.rb * spec/controllers/*/.rb xref https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* \| \| \|	Merge branch 'image-comment-reviews-ce' into 'master'	Filipa Lacerda	2019-04-15	5	-11/+39
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of image-comment-reviews See merge request gitlab-org/gitlab-ce!27271
\| * \| \| \|	CE backport of image-comment-reviews	Phil Hughes	2019-04-12	5	-11/+39
\| \| \| \| \|
* \| \| \| \|	Merge branch '10921-display-scoped-labels-ce' into 'master'	Kushal Pandya	2019-04-15	13	-24/+181
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display scoped labels in Issue Boards See merge request gitlab-org/gitlab-ce!27164
\| * \| \| \| \|	Display scoped labels in Issue Boards	Rajat Jain	2019-04-15	13	-24/+181
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change brings new Scoped labels to Issue board as well. With the last change, this was missed.
* \| \| \| \|	Merge branch '17014-remove-rails-deprecated_sanitizer' into 'master'	Douwe Maan	2019-04-15	5	-11/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Remove rails-deprecated_sanitizer" Closes #17014 See merge request gitlab-org/gitlab-ce!27268
\| * \| \| \| \|	Remove rails-deprecated_sanitizer dependency17014-remove-rails-deprecated_sanitizer	Dmitriy Zaporozhets	2019-04-12	5	-11/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'sh-disable-postgresql-fsync-ci' into 'master'	Kamil Trzciński	2019-04-15	1	-4/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable PostgreSQL fsync for faster CI Closes #60435 See merge request gitlab-org/gitlab-ce!27295
\| * \| \| \| \| \|	Turn off database durability settings in CIsh-disable-postgresql-fsync-ci	Stan Hu	2019-04-12	1	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As described in https://www.postgresql.org/docs/current/non-durability.html, we can save money and time by disabling durability in tests.
* \| \| \| \| \| \|	Merge branch '60480-rescue-build-preparing-errors' into 'master'	Kamil Trzciński	2019-04-15	2	-4/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rescue and log errors raised when preparing builds Closes #60480 See merge request gitlab-org/gitlab-ce!27351
\| * \| \| \| \| \| \|	Rescue and log errors raised when preparing builds60480-rescue-build-preparing-errors	Tiger	2019-04-15	2	-4/+20
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/60480
* \| \| \| \| \| \|	Merge branch 'frozen_string_literal_qa' into 'master'	Sanad Liaquat	2019-04-15	98	-1/+198
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add frozen_string_literal to qa/ See merge request gitlab-org/gitlab-ce!27266
\| * \| \| \| \| \|	Add frozen_string_literal to qa/frozen_string_literal_qa	Thong Kuah	2019-04-13	98	-1/+198
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be default in Ruby 3, so will be good to apply in QA ahead of time to be consistent.
* \| \| \| \| \| \|	Merge branch '31331-add-time-tracking-issue-boards-sidebar' into 'master'	Tim Zallmann	2019-04-12	7	-13/+63
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add time tracking information to Issue Boards sidebar Closes #31331 See merge request gitlab-org/gitlab-ce!27166
\| * \| \| \| \| \|	Add changelog entry31331-add-time-tracking-issue-boards-sidebar	Kushal Pandya	2019-04-12	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add time tracking information to Issue Boards sidebar	Kushal Pandya	2019-04-12	6	-13/+58
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add time tracking progress bar to Issue Boards sidebar.
* \| \| \| \| \|	Merge branch 'fix-protected_branches_spec-master' into 'master'60477-docs-feedback-emoji-pictures-are-broken	Michael Kozono	2019-04-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE Fix protected branch example failing on master See merge request gitlab-org/gitlab-ce!27332
\| * \| \| \| \| \|	Fix protected branch example failing on masterfix-protected_branches_spec-master	Luke Bennett	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Failing due to updates in capybara and selenium driver.
* \| \| \| \| \| \|	Merge branch 'sh-revert-untrusted-chrome-repo' into 'master'	Douglas Barbosa Alexandre	2019-04-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'" See merge request gitlab-org/gitlab-ce!27329
\| * \| \| \| \| \|	Revert "Merge branch 'sh-allow-unauth-chrome' into 'master'"sh-revert-untrusted-chrome-repo	Stan Hu	2019-04-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 026c92d5fa82fac87386d5691c3d5b1e02f2eb5e, reversing changes made to 8cda9d33a96e34c3809dcaddcde2619cc4923c0b.
* \| \| \| \| \| \|	Merge branch ↵	Fatih Acet	2019-04-12	2	-1/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'60369-border-radius-still-showing-up-after-improve-diff-nav-header-was-finished' into 'master' Breakpoints.isDesktop should not always return false Closes #60369 See merge request gitlab-org/gitlab-ce!27240
\| * \| \| \| \| \| \|	Fix isDesktop function to return proper value	Sam Bigelow	2019-04-12	2	-1/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '11124-update-deployment-service-fails-if-project-is-nil' into ↵	Stan Hu	2019-04-12	3	-11/+33
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Always return the deployment in the UpdateDeploymentService#execute method Closes gitlab-ee#11124 See merge request gitlab-org/gitlab-ce!27322
\| * \| \| \| \| \| \|	Add CHANGELOG entry	Douglas Barbosa Alexandre	2019-04-12	1	-0/+5
\| \| \| \| \| \| \| \|