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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Bring changes from EEunify-container_registry_authentication_service_spec.rb	Lin Jen-Shin	2018-06-21	1	-0/+13
\|
*	Merge branch 'restore-custom-hooks-wiki' into 'master'	Douwe Maan	2018-06-21	1	-0/+2
\|\ \| \| \| \| \| \| \| \|	Restore custom hooks for wiki See merge request gitlab-org/gitlab-ce!20065
\| *	Restore custom hooks for wikirestore-custom-hooks-wiki	Ahmad Hassan	2018-06-21	1	-0/+2
\| \|
* \|	Merge branch 'changes_tab_vue_refactoring' into 'master'	Tim Zallmann	2018-06-21	221	-2282/+8933
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Changes tab VUE refactoring Closes #42882 See merge request gitlab-org/gitlab-ce!17011
\| *	Changes tab VUE refactoring	Felipe Artur	2018-06-21	221	-2282/+8933
\|/
*	Merge branch 'blackst0ne-rails5-set-request-format-in--commits-controller' ↵	Rémy Coutable	2018-06-21	2	-0/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' [Rails5] Set request.format in commits_controller Closes #48144 et #48143 See merge request gitlab-org/gitlab-ce!20023
\| *	[Rails5] Set request.format in commits_controllerblackst0ne-rails5-set-request-format-in--commits-controller	blackst0ne	2018-06-20	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since Rails 5.0 `request.format` is being set depending on the route extension. In commits pages we pass a ref as a URL parameter. If the ref is an extension-like, Rails converts it and sets to `request.format`. E.g. if the ref is `some_branch.atom`, Rails starts responding with `atom` format, but it should response with `html` because `.atom` is the part of ref name, not the format. This commit explicitly sets `request.format` to `:html` when needed.
* \|	Merge branch 'da-usage-ping' into 'master'	Sean McGivern	2018-06-21	2	-23/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add enabled prefix to feature keys to be consistent with other keys See merge request gitlab-org/gitlab-ce!20043
\| * \|	Add enabled prefix to feature keys to be consistent with other keysda-usage-ping	Douglas Barbosa Alexandre	2018-06-20	2	-23/+24
\| \| \|
* \| \|	Merge branch 'dm-label-reference-period' into 'master'	Sean McGivern	2018-06-21	3	-8/+20
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly detect label reference if followed by period or question mark See merge request gitlab-org/gitlab-ce!19965
\| * \| \|	Add spec for more examples of trailing punctuation that should be ignoreddm-label-reference-period	Douwe Maan	2018-06-20	1	-3/+5
\| \| \| \|
\| * \| \|	Properly detect label reference if followed by period or question mark	Douwe Maan	2018-06-18	3	-7/+17
\| \| \| \|
* \| \| \|	Merge branch 'blackst0ne-rails5-fix-action-cable-mount-path' into 'master'	Rémy Coutable	2018-06-21	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rails5] Fix ActionCable's mount_path configuration See merge request gitlab-org/gitlab-ce!20051
\| * \| \| \|	[Rails5] Fix ActionCable's mount_path configurationblackst0ne-rails5-fix-action-cable-mount-path	blackst0ne	2018-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The original MR [1] fixed red specs for Rails 5. But while the failed specs were fixed, that changes brought new failed specs which weren't caught up in [1]. This commit just fixes the fix. :) New errors are like these: ``` Failed to upgrade to WebSocket (REQUEST_METHOD: GET, HTTP_CONNECTION: keep-alive, HTTP_UPGRADE: ) Finished "/-/boards/1/lists"[non-WebSocket] for 127.0.0.1 at 2018-06-20 18:09:26 +0200 ``` [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20015
* \| \| \| \|	Merge branch 'rails5-fix-48140' into 'master'	Rémy Coutable	2018-06-21	3	-0/+10
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails 5 fix Capybara::ElementNotFound: Unable to find visible css #modal-revert-commit Closes #48140 et #48139 See merge request gitlab-org/gitlab-ce!20044
\| * \| \| \| \|	Rails 5 fix Capybara::ElementNotFound: Unable to find visible css ↵	Jasper Maes	2018-06-20	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#modal-revert-commit and expected: "/bar" got: "/foo"
* \| \| \| \| \|	Merge branch 'zj-raw-changes-mandatory' into 'master'	Douwe Maan	2018-06-21	2	-54/+29
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raw changes calculation is Gitaly only now Closes gitaly#1138 See merge request gitlab-org/gitlab-ce!20057
\| * \| \| \| \| \|	Raw changes calculation is Gitaly only now	Zeger-Jan van de Weg	2018-06-21	2	-54/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitaly/issues/1138
* \| \| \| \| \| \|	Merge branch 'bvl-finder-methods-cop' into 'master'	Douwe Maan	2018-06-21	5	-4/+110
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a cop for `FinderMethods` Closes #42705 See merge request gitlab-org/gitlab-ce!19951
\| * \| \| \| \| \|	Add a cop for `FinderMethods`bvl-finder-methods-cop	Bob Van Landuyt	2018-06-20	5	-4/+110
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This notifies developers when calling `find(_by!)` chained on `execute`. And suggests using the methods from `FinderMethods`. These will perform the correct authorization checks on the resource when it is found.
* \| \| \| \| \| \|	Update VERSION to 11.1.0-prev11.1.0.pre	Filipa Lacerda	2018-06-21	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update CHANGELOG.md for 11.0.0	Filipa Lacerda	2018-06-21	214	-1074/+240
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge branch 'MadLittleMods-master-patch-55656' into 'master'	Filipa Lacerda	2018-06-21	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a couple Vuex typos See merge request gitlab-org/gitlab-ce!20046
\| * \| \| \| \| \| \|	Fix a couple Vuex typosMadLittleMods-master-patch-55656	Eric Eastwood	2018-06-20	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs-styleguidelines-nav' into 'master'	Achilleas Pipinellis	2018-06-21	1	-2/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: update style guidelines with rules for navigation items See merge request gitlab-org/gitlab-ce!20024
\| * \| \| \| \| \| \| \|	clarify what "methods" aredocs-styleguidelines-nav	Marcia Ramos	2018-06-20	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update styleguide.md with rules for navigation items	Marcia Ramos	2018-06-20	1	-2/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'mk/fix-n-plus-1-queries-in-uploads-check-rake-task' into 'master'	Stan Hu	2018-06-20	3	-9/+39
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix N+1 queries in uploads check rake task Closes #47924 See merge request gitlab-org/gitlab-ce!20012
\| * \| \| \| \| \| \| \|	Fix documentation code blocksmk/fix-n-plus-1-queries-in-uploads-check-rake-task	Michael Kozono	2018-06-20	1	-0/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Avoid N+1 queries while processing uploads	Michael Kozono	2018-06-20	2	-9/+38
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fallback-to-first-tab-signin' into 'master'	Clement Ho	2018-06-20	2	-0/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fall back to the first sign-in tab if the local storage value is bad See merge request gitlab-org/gitlab-ce!20050
\| * \| \| \| \| \| \| \| \|	Fall back to the first sign-in tab if the local storage value is bad	Stan Hu	2018-06-20	2	-0/+20
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If `current_signin_tab` is `#crowd`, then no tab will be active. Fix this by using the first available tab. Relates to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20049#note_82996324
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-dont-generate-mo' into 'master'	Rubén Dávila	2018-06-20	2	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't generate `.mo` files Closes #47979 See merge request gitlab-org/gitlab-ce!20048
\| * \| \| \| \| \| \| \| \|	Don't generate `.mo` files	Bob Van Landuyt	2018-06-20	2	-1/+5
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since we are only using `.po` files for translation we can shave off some setup time. Generating the `mo` files also regenerates the PO-files, including fuzzy translations. Those cause a lot of bugs, and we don't need them anymore since the `po` files are generated by an external translation service.
* \| \| \| \| \| \| \| \|	Merge branch 'jr-48133-web-ide-commit-ellipsis' into 'master'	Tim Zallmann	2018-06-20	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Web IDE "Commit" button should indicate when there's a subsequent step" Closes #48133 See merge request gitlab-org/gitlab-ce!20030
\| * \| \| \| \| \| \| \|	Add ellipsis to Web IDE commit buttonjr-48133-web-ide-commit-ellipsis	James Ramsay	2018-06-20	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The blue shortcut commit button opens the commit interface to actually perform the commit. The ellipsis indicates the button doesn't immediately perform the commit.
* \| \| \| \| \| \| \| \|	Merge branch 'improve-scripts-trigger-build' into 'master'	Robert Speicher	2018-06-20	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ignore GitLab API hiccups in scripts/trigger-build See merge request gitlab-org/gitlab-ce!20038
\| * \| \| \| \| \| \| \| \|	Ignore GitLab API hiccups in scripts/trigger-buildimprove-scripts-trigger-build	Rémy Coutable	2018-06-20	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2018-06-20	2	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964' into 'master' Resolve "qa/specs/features/login/ldap_spec.rb is failing after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19964" Closes #48159 See merge request gitlab-org/gitlab-ce!20027
\| * \| \| \| \| \| \| \| \| \|	[QA] Fix qa/qa/specs/features/login/ldap_spec.rb48159-qa-specs-features-login-ldap_spec-rb-is-failing-after-https-gitlab-com-gitlab-org-gitlab-ce-merge_requests-19964	Rémy Coutable	2018-06-20	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'unify-lib-tasks' into 'master'	Robert Speicher	2018-06-20	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unify flay.rake and gettext.rake from EE See merge request gitlab-org/gitlab-ce!20041
\| * \| \| \| \| \| \| \| \| \| \|	Unify flay.rake and gettext.rake from EEunify-lib-tasks	Lin Jen-Shin	2018-06-21	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '47488-remove-unmergeable-notification-for-no-commits' into ↵	Robert Speicher	2018-06-20	9	-70/+33
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Notify only merge request unmergeable due to conflict See merge request gitlab-org/gitlab-ce!19548
\| * \| \| \| \| \| \| \| \| \| \|	Fix possiblilty of branch not found47488-remove-unmergeable-notification-for-no-commits	Mark Chao	2018-06-20	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This now can happen because can_be_merged? is called during MR merge_status transition to cannot_be_merged. It is possible branch_name is invalid.
\| * \| \| \| \| \| \| \| \| \| \|	Notify only when unmergeable due to conflict	Mark Chao	2018-06-20	8	-68/+28
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is still the edge case when 'no commits' changes to 'conflict' would not trigger notification, which we ignore for now. Calling can_be_merged? can cause exception (e.g. non-UTF8) Ignore those by rescueing. Remove unmergeable_reason as now only conflict is notified Update spec
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'project_wiki_scenario_automation' into 'master'	Rémy Coutable	2018-06-20	22	-70/+314
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Wiki Scenario Automation gitlab-qa#263 Closes gitlab-qa#263 See merge request gitlab-org/gitlab-ce!19568
\| * \| \| \| \| \| \| \| \| \|	Added Wiki Scenario Automation gitlab-qa#263	Ramya A	2018-06-20	22	-70/+314
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch '47964-custom-logo-rendering-improperly-on-sign-in-page-2' into ↵	Mike Greiling	2018-06-20	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Custom logo rendering improperly on sign-in page" Closes #47964 See merge request gitlab-org/gitlab-ce!20037
\| * \| \| \| \| \| \| \| \| \|	Fix navigation bar center logo for custom logos	Clement Ho	2018-06-20	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'rs-platform-feature-spec-parity' into 'master'	Rémy Coutable	2018-06-20	1	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the stubbed methods for SAML authorize paths more specific See merge request gitlab-org/gitlab-ce!20009