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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Automatically update MR merge-ref along merge statusosw-sync-merge-ref-upon-mergeability-check	Oswaldo Ferreira	2019-06-12	14	-224/+472
\| \| \| \| \| \| \| \| \| \| \| \|	This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
*	Merge branch 'ce-11629-notify-users-when-their-ci-minutes-quota-has-run-out' ↵	Mayra Cabrera	2019-06-12	3	-1/+22
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Backport of gitlab-ee!13735 See merge request gitlab-org/gitlab-ce!29289
\| *	Backport of gitlab-ee!13735	Rubén Dávila	2019-06-12	3	-1/+22
\|/
*	Merge branch ↵	Annabel Dunstone Gray	2019-06-12	1	-3/+3
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view' into 'master' Resolve "Visual regression in 12.0: line numbers not lining up in file view" Closes #63010 See merge request gitlab-org/gitlab-ce!29403
\| *	Align line numbers for non-default font size63010-visual-regression-in-12-0-line-numbers-not-lining-up-in-file-view	Simon Knox	2019-06-10	1	-3/+3
\| \|
* \|	Merge branch 'sh-fix-resolve-button-not-available' into 'master'	Fatih Acet	2019-06-12	3	-3/+79
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix "Resolve conflicts" button not appearing for some users Closes #47954 See merge request gitlab-org/gitlab-ce!29535
\| * \|	Fix "Resolve conflicts" button not appearing for some userssh-fix-resolve-button-not-available	Stan Hu	2019-06-11	3	-3/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously the frontend assumed that the user had to be able to merge to that project in order to resolve conflicts. However, this is overly restrictive, as the user only has to be able to push to the source branch. In fact, appending the text /conflicts to the merge request would bring up the conflict resolution page. This confusion happens when a project contains a protected branch that only allows maintainers to push. Users with Developer access no longer have permission to merge, but they still can create branches in that project. To fix this issue, we now loosen the permission check for the "Resolve conflicts" button and only check for access to push to the source branch. This is consistent with what the backend does in MergeRequests::Conflicts::ListService#can_be_resolved_by?. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/47954
* \| \|	Merge branch 'ealcantara-popover-styling' into 'master'	Annabel Dunstone Gray	2019-06-12	7	-43/+93
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style popovers according to the design specs See merge request gitlab-org/gitlab-ce!28375
\| * \| \|	Nest category-icon inside .user-popoverealcantara-popover-styling	Enrique Alcantara	2019-06-07	1	-4/+4
\| \| \| \|
\| * \| \|	Cleanup deprecation message popover	Enrique Alcantara	2019-06-07	3	-25/+1
\| \| \| \|
\| * \| \|	Extract user-popover styles	Enrique Alcantara	2019-06-07	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate use-case specific user-popover styles from general popover styles.
\| * \| \|	Address feature highlight popover inconsistencies	Enrique Alcantara	2019-06-07	3	-6/+4
\| \| \| \|
\| * \| \|	Style popovers according to the design specs	Enrique Alcantara	2019-06-07	4	-15/+87
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Apply new styles for header, padding, border, and fonts - Remove bootstrap 3 backward compat code
* \| \| \|	Merge branch 'sh-update-openid-omniauth-gem' into 'master'	Douglas Barbosa Alexandre	2019-06-12	4	-17/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump omniauth_openid_connect to 0.3.1 See merge request gitlab-org/gitlab-ce!29387
\| * \| \| \|	Bump omniauth_openid_connect to 0.3.1sh-update-openid-omniauth-gem	Stan Hu	2019-06-08	4	-17/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In https://gitlab.com/gitlab-org/gitlab-ce/issues/62208, users were seeing 404 errors when they configured their OpenID provider without a name parameter since OmniAuth would use the name `openidconnect` instead `openid_connect`. https://github.com/m0n9oose/omniauth_openid_connect/pull/23 makes the default parameter `openid_connect` so this additional initializer in GitLab is not necessary. Plus, this change enables users to use multiple OpenID Connect providers if they desire.
* \| \| \| \|	Merge branch 'jc-migration-for-source-project-id' into 'master'	Andreas Brandl	2019-06-12	3	-0/+53
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix null source_project_id in pool_repositories Closes gitaly#1653 See merge request gitlab-org/gitlab-ce!29157
\| * \| \| \| \|	Fix null source_project_id in pool_repositoriesjc-migration-for-source-project-id	John Cai	2019-06-11	3	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a bug, some pool_repositories in production have a null source_project_id column. This migration aims to fix those rows.
* \| \| \| \| \|	Merge branch 'add_video_to_jira_int' into 'master'	Mike Lewis	2019-06-12	2	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added links to Jira/Jenkins videos to supplement docs See merge request gitlab-org/gitlab-ce!29516
\| * \| \| \| \| \|	Streamline and edit video referencesadd_video_to_jira_int	Mike Lewis	2019-06-12	1	-4/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Apply suggestion to doc/user/project/integrations/jira.md	Mike Lewis	2019-06-12	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added links to videos to supplement docs	Russell Dickenson	2019-06-12	2	-2/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'prom-api-3' into 'master'	Mike Greiling	2019-06-12	10	-14/+234
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch charts to Prometheus API endpoint CE-3 Closes #58516 See merge request gitlab-org/gitlab-ce!29280
\| * \| \| \| \| \| \|	Use Prometheus API for dashboard metricsprom-api-3	Simon Knox	2019-06-07	10	-14/+234
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make API request for each chart
* \| \| \| \| \| \| \|	Merge branch 'upgrade-pages-to-v1.6.1' into 'master'	Nick Thomas	2019-06-12	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgrade pages to v1.6.1 Closes gitlab-pages#228 See merge request gitlab-org/gitlab-ce!29559
\| * \| \| \| \| \| \| \|	Upgrade pages to v1.6.1	Vladimir Shushlin	2019-06-12	2	-1/+6
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-diverged-branch-locals' into 'master'	Stan Hu	2019-06-12	2	-1/+6
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix diverged branch locals See merge request gitlab-org/gitlab-ce!29508
\| * \| \| \| \| \| \| \|	Fix diverged branch localsfix-diverged-branch-locals	Luke Bennett	2019-06-12	2	-1/+6
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'prom-api-2' into 'master'	Mike Greiling	2019-06-12	12	-13/+266
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Switch charts to Prometheus API endpoint CE-2 See merge request gitlab-org/gitlab-ce!29226
\| * \| \| \| \| \| \| \|	Add feature flag and dashboard endpointprom-api-2	Simon Knox	2019-06-07	12	-13/+266
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First part of FE for Prometheus API Dashboard endpoint fetches all info except for chart results Renders empty groups after loading
* \| \| \| \| \| \| \| \|	Merge branch 'rack-timeout-rename' into 'master'	Bob Van Landuyt	2019-06-12	4	-50/+74
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved RackTimeout observer to a different location and ignore transition states See merge request gitlab-org/gitlab-ce!29214
\| * \| \| \| \| \| \| \| \|	Monitor only final statesrack-timeout-rename	Jan Provaznik	2019-06-12	2	-3/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no reason to monitor transition states so we ignore ready and active states. We can get ratio of completed vs failed requests from final states.
\| * \| \| \| \| \| \| \| \|	Moved RackTimeout observer to a different location	Jan Provaznik	2019-06-12	4	-48/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because there will be similar observer for PumaWorkerKiller, it makes sense to keep both on better place.
* \| \| \| \| \| \| \| \| \|	Merge branch '10891-usage-ping-for-incident-management-ce' into 'master'	Rémy Coutable	2019-06-12	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Whitelist query limiting admin usage data endpoint See merge request gitlab-org/gitlab-ce!29488
\| * \| \| \| \| \| \| \| \| \|	Whitelist query limiting admin usage data endpoint	Peter Leitzen	2019-06-12	1	-0/+6
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add_gitflow_video' into 'master'	Mike Lewis	2019-06-12	2	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added link to GitFlow video See merge request gitlab-org/gitlab-ce!29517
\| * \| \| \| \| \| \| \| \| \|	Fix capitalization error	Mike Lewis	2019-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update inclusion of GitLab Flow links in GitLab Basics	Mike Lewis	2019-06-12	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update gitlab_flow.md to add GitLab Flow video	Mike Lewis	2019-06-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Added link to GitFlow videodocs/add_gitflow_video	Russell Dickenson	2019-06-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ce-5276-5-terminal-sync-status-label' into 'master'	Phil Hughes	2019-06-12	5	-23/+124
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE for Part 5] 5276 Extract ide_status_list from ide_status_bar See merge request gitlab-org/gitlab-ce!29371
\| * \| \| \| \| \| \| \| \| \| \|	Extract ide_status_list from ide_status_bar	Paul Slaughter	2019-06-12	5	-23/+124
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Why? The ide_status_list will be used and extended in EE.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '58433-email-notifications-do-not-work-properly-issue-due-date' ↵	Nick Thomas	2019-06-12	3	-2/+241
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Email notifications do not work properly (issue due date)" Closes #58433 See merge request gitlab-org/gitlab-ce!28835
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "Email notifications do not work properly (issue due date)"	Eugenia Grieff	2019-06-12	3	-2/+241
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'typo-fixes' into 'master'	Marcia Ramos	2019-06-12	6	-47/+48
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Typos See merge request gitlab-org/gitlab-ce!29551
\| * \| \| \| \| \| \| \| \| \| \|	Fix Typos	Yoginth	2019-06-12	6	-47/+48
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add_autodevops_video' into 'master'	Mike Lewis	2019-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to Auto DevOps video See merge request gitlab-org/gitlab-ce!29520
\| * \| \| \| \| \| \| \| \| \| \|	Add link to Auto DevOps video	Russell Dickenson	2019-06-12	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/add_cicd_example_videos' into 'master'	Mike Lewis	2019-06-12	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add links to CI/CD videos See merge request gitlab-org/gitlab-ce!29526
\| * \| \| \| \| \| \| \| \| \| \|	Add links to CI/CD videos	Russell Dickenson	2019-06-12	1	-1/+5
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mj/feature-freeze-process' into 'master'	Yorick Peterse	2019-06-12	1	-18/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the feature freeze details See merge request gitlab-org/gitlab-ce!29548