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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add CHANGELOG entry	Douglas Barbosa Alexandre	2018-09-21	1	-0/+5
\|
*	Fix leading slash in redirects and add cop	Sanad Liaquat	2018-09-21	1	-0/+5
\|
*	Correct Gitlab Capitalization in code files	Marcel Amirault	2018-09-21	1	-8/+8
\|
*	Merge branch ↵	Dmitriy Zaporozhets	2018-09-21	1	-0/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'47398-user-is-unable-revoke-a-authorized-application-unless-user-oauth-applications-is-checked-in-admin-settings' into 'master' Resolve "User is unable revoke a Authorized application unless User OAuth applications is checked in admin settings" Closes #47398 See merge request gitlab-org/gitlab-ce!21835
\| *	Always allow user to revoke an authorized application	Dmitriy Zaporozhets	2018-09-20	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \|	Even if User OAuth applications setting is disabled in admin settings. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Update CHANGELOG.md for 11.3.0	GitLab Release Tools Bot	2018-09-21	223	-1124/+0
\| \| \| \| \| \|	[ci skip]
* \|	Merge branch 'fix-chat-notification-service-for-ee' into 'master'	Dmitriy Zaporozhets	2018-09-21	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix activity titles for MRs in chat notification services Closes gitlab-ee#5325 See merge request gitlab-org/gitlab-ce!21834
\| * \|	Fix activity titles for MRs in chat notification services	Nick Thomas	2018-09-20	1	-0/+5
\| \|/
* \|	Merge branch '41040-long-webhook-url-problem' into 'master'	Phil Hughes	2018-09-21	1	-0/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix long webhook URL overflow for custom integration Closes #41040 See merge request gitlab-org/gitlab-ce!21668
\| * \|	Fix long webhook URL overflow for custom integration	Kukovskii Vladimir	2018-09-11	1	-0/+5
\| \| \|
* \| \|	Merge branch 'frozen-string-app-controller' into 'master'	Stan Hu	2018-09-20	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable frozen string in app/controllers/*/.rb See merge request gitlab-org/gitlab-ce!21736
\| * \| \|	Enable frozen string in app/controllers/*/.rbrepo-forks/gitlab-ce-frozen-string-app-controller	gfyoung	2018-09-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enables frozen string for the following: * app/controllers/.rb app/controllers/admin/*/.rb * app/controllers/boards/*/.rb * app/controllers/ci/*/.rb * app/controllers/concerns/*/.rb Partially addresses #47424.
* \| \| \|	Merge branch '51549-runners-table' into 'master'	Annabel Dunstone Gray	2018-09-20	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes Admin Runners table not wrapping the content Closes #51549 See merge request gitlab-org/gitlab-ce!21802
\| * \| \| \|	Wrap content for admin runners table	Filipa Lacerda	2018-09-20	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While refactoring the table into a responsive one we did not account for wrapping issues. This commit wraps some cells and truncates others. Adds `section-5` class to the responsive tables CSS
* \| \| \| \|	Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'	Dmitriy Zaporozhets	2018-09-20	1	-0/+5
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
\| * \| \| \|	merge master and resolve conflicts	Martin Wortschack	2018-09-11	40	-0/+202
\| \|\ \ \ \
\| * \ \ \ \	merge master and resolve conflicts	Martin Wortschack	2018-09-06	51	-0/+257
\| \|\ \ \ \ \
\| * \| \| \| \| \|	split application settings into multiple sub pages	Martin Wortschack	2018-09-04	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '44768-lazy-load-xterm-css' into 'master'	Phil Hughes	2018-09-20	1	-0/+5
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Lazy load xterm css custom colors file Closes #44768 See merge request gitlab-org/gitlab-ce!21804
\| * \| \| \| \| \|	Lazy load xterm css colors	Filipa Lacerda	2018-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Manually includes the xterm custom colors on the 3 files that will need it: job log page, job terminal page, environment terminal page Reduces main CSS bundle
* \| \| \| \| \| \|	Merge branch 'sh-delete-tags-outside-transaction' into 'master'	Robert Speicher	2018-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Delete container repository tags outside of transaction Closes #51380 See merge request gitlab-org/gitlab-ce!21679
\| * \| \| \| \| \| \|	Delete container repository tags outside of transaction	Stan Hu	2018-09-19	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there are many tags in a container repository, deleting them can exceed the default 60 second idle-in-transaction timeout in Sidekiq. We now explicitly delete them in the DestroyService before destroying the model. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51380
* \| \| \| \| \| \| \|	Merge branch 'mr-legacy-diff-notes' into 'master'	Filipa Lacerda	2018-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs Closes #48873 See merge request gitlab-org/gitlab-ce!21652
\| * \| \| \| \| \| \| \|	Fixed diff store actions spec	Phil Hughes	2018-09-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated diff mutations and utils spec to check for legacy notes
\| * \| \| \| \| \| \| \|	Re-enable legacy diff notes on merge request diffs	Phil Hughes	2018-09-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This re-enables legacy diff notes on the merge request diffs This feature was not workig correctly after the Vue refactor LegacyDiffNotes have no `position`, instead they only have a `line_code` As an extra, this also re-enables commenting on legacy diffs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/48873
* \| \| \| \| \| \| \| \|	Include post migrations when loading the schema	Yorick Peterse	2018-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See merge request gitlab-org/gitlab-ce!21689
\| * \| \| \| \| \| \| \| \|	Add merge-request to changelog	DJ Mountney	2018-09-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix the schema load test	DJ Mountney	2018-09-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And added changelog
* \| \| \| \| \| \| \| \| \|	Use standalone diff stats RPC on every comparison view	Oswaldo Ferreira	2018-09-19	1	-0/+5
\| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'vendor-gitlab-ci-auto-devops-yml' into 'master'	Kamil Trzciński	2018-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Vendor Auto-DevOps.gitlab-ci from gitlab-ci-yml See merge request gitlab-org/gitlab-ce!21775
\| * \| \| \| \| \| \| \| \|	Vendor Auto-DevOps.gitlab-ci from gitlab-ci-yml	Mayra Cabrera	2018-09-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses curl instead of wget on install_dependencies, as wget does not support https through http proxy on alpine:latest
* \| \| \| \| \| \| \| \| \|	Merge branch '51571-wrapper-rake-task-uploads-migrate-os' into 'master'	Douwe Maan	2018-09-19	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add wrapper rake task to migrate all uploads to OS Closes #51571 See merge request gitlab-org/gitlab-ce!21779
\| * \| \| \| \| \| \| \| \|	Add wrapper rake task to migrate all uploads to OS	Balasankar "Balu" C	2018-09-18	1	-0/+5
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a rake task that will trigger gitlab:uploads:migrate rake task with different possible arguments, one by one.
* \| \| \| \| \| \| \| \|	Resolve "Enable Auto DevOps by default for self managed instances of GitLab"	Dylan Griffith	2018-09-18	1	-0/+5
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Improve cluster apps installation flow	Mike Greiling	2018-09-18	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Resolve "Move filter dropdown from Font Awesome to our own icons"	Constance Okoghenun	2018-09-18	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '51564-fix-commit-email-usage' into 'master'	Douwe Maan	2018-09-18	1	-0/+5
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Respect the user commit email in more places Closes #51564 See merge request gitlab-org/gitlab-ce!21773
\| * \| \| \| \| \| \| \|	Add changelog	Nick Thomas	2018-09-18	1	-0/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch ↵	Douwe Maan	2018-09-18	2	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'45754-open-issues-from-archived-project-listed-in-group-issue-board' into 'master' Resolve "Open issues from archived project listed in group issue board" Closes #45754 See merge request gitlab-org/gitlab-ce!21721
\| * \| \| \| \| \| \| \| \|	Filter out archived projects from issue/mr count	Brett Walker	2018-09-17	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass the 'non_archived' flag to finder methods
* \| \| \| \| \| \| \| \| \|	Expose runners status information in job api	Steve Azzopardi	2018-09-18	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'osw-gitaly-diff-stats-client' into 'master'	Douwe Maan	2018-09-17	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Gitaly diff stats RPC client See merge request gitlab-org/gitlab-ce!21732
\| * \| \| \| \| \| \| \| \| \|	Add Gitaly diff stats RPC client	Oswaldo Ferreira	2018-09-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds a basic interface to fetch diff statistics given two SHAs. It's a requirement for #49399 #20282 and #19232.
* \| \| \| \| \| \| \| \| \| \|	Add 2fa button	Luke Picciau	2018-09-17	1	-0/+5
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '50956-web-terminal' into 'master'	Phil Hughes	2018-09-17	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include correct CSS file for xterm in environments page Closes #50956 See merge request gitlab-org/gitlab-ce!21768
\| * \| \| \| \| \| \| \| \|	Include correct CSS file for xterm in environments page	Filipa Lacerda	2018-09-17	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the xterm dependency was moved to a npm dependency the CSS file path was not updated correctly in the environments page. In order for xterm to render properly, it needs the correct CSS path.
* \| \| \| \| \| \| \| \| \|	Merge branch '44596-double-title-merge-request-message' into 'master'	Grzegorz Bizon	2018-09-17	1	-0/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix double title in merge request chat messages Closes #44586 See merge request gitlab-org/gitlab-ce!21670
\| * \| \| \| \| \| \| \| \| \|	Add fix for EE merge message	Kukovskii Vladimir	2018-09-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix double title in merge request chat messages	Kukovskii Vladimir	2018-09-11	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Resolve "Unable to import repository: undefined method `import_file' for ↵	James Lopez	2018-09-17	1	-0/+5
\| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nil:NilClass"