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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Resolve "When changing project visibility setting, change other dropdowns ↵	Mike Greiling	2017-06-06	1	-2/+2
\| \| \| \|	automatically"
*	Merge branch 'issue-23254' into 'master'	Rémy Coutable	2017-06-06	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Cleanup style of confirmation page See merge request !11774
\| *	Fixed style on unsubscribe page	Gustav Ernberg	2017-06-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed unnecassary logic Added missing 'the' Fix case Fixed specs
* \|	Merge branch 'pull-mirror-overhaul-ce-backport' into 'master'	Douwe Maan	2017-06-05	1	-0/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	backports changed import logic from pull mirroring feature into CE See merge request !11850
\| * \|	backports changed import logic from pull mirroring feature into CE	Tiago Botelho	2017-06-05	1	-0/+6
\| \| \|
* \| \|	Merge branch '28694-hard-delete-user-from-admin-panel' into 'master'	Douwe Maan	2017-06-05	1	-1/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow users to be hard-deleted from the admin panel Closes #28694 See merge request !11874
\| * \| \|	Allow users to be hard-deleted from the admin user show page	Nick Thomas	2017-06-05	1	-0/+3
\| \| \| \|
\| * \| \|	Allow users to be hard-removed from the admin users list page	Nick Thomas	2017-06-05	1	-1/+2
\| \| \| \|
* \| \| \|	Merge branch ↵	Douwe Maan	2017-06-05	1	-0/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboard' into 'master' Use last_activity_at attr when showing the update date in project listing Closes #32869 See merge request !11896
\| * \| \| \|	Use last_activity_at attr when showing the update date in project listing32869-project-s-last-updated-time-not-accurately-reflected-in-projects-dashboard	Ruben Davila	2017-06-03	1	-0/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch ↵	Douwe Maan	2017-06-05	3	-13/+7
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening' into 'master' Increase diff limits to 100 KB for collapse and 200 KB overall Closes #31983 See merge request !11875
\| * \| \| \|	Increase diff limits to 100 KB for collapse and 200 KB overall31983-increase-merge-request-diff-file-size-limit-for-default-toggle-opening	Sean McGivern	2017-06-02	3	-13/+7
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is controlled with the feature flag gitlab_git_diff_size_limit_increase. Both of these limits were basically picked arbitrarily in the first place; disabling the feature flag reverts to the old limits.
* \| \| \|	Merge branch '30469-convdev-index' into 'master'	Sean McGivern	2017-06-05	1	-0/+40
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ConvDev Index Closes #30469 See merge request !11377
\| * \| \|	Add Conversational Development Index page to admin panel	Taurie Davis, Simon Knox and Adam Niedzielski	2017-06-01	1	-0/+40
\| \|/ /
* \| \|	32118 Make New environment empty state btn lowercase32118-new-environment-btn-copy	tauriedavis	2017-06-02	1	-1/+3
\| \|/ \|/\|
* \|	Merge branch 'winh-styled-people-search-bar' into 'master'	Tim Zallmann	2017-06-02	3	-4/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style people in issuable search bar Closes #30468 See merge request !11402
\| * \|	Style people in issuable search bar (!11402)winh-styled-people-search-bar	winh	2017-06-02	3	-4/+6
\| \| \|
* \| \|	Merge branch 'blameless' into 'master'	Rémy Coutable	2017-06-02	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Promote blameless culture by using "annotate" instead See merge request !10378
\| * \| \|	Promote blameless culture by using "annotate" instead	Ilya Vassilevsky	2017-06-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	User-facing changes (fast & easy win)
* \| \| \|	Merge branch '31511-jira-settings' into 'master'	Sean McGivern	2017-06-02	3	-7/+117
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Simplify test&save actions when setting a service integration Closes #31511 See merge request !11599
\| * \| \| \|	Minor refactor based on review feedback	kushalpandya	2017-06-02	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Address review comments31511-jira-settings	Jarka Kadlecova	2017-06-02	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Address MR comments	Jarka Kadlecova	2017-06-01	1	-0/+12
\| \| \| \| \|
\| * \| \| \|	fix failing specs	Jarka Kadlecova	2017-06-01	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Add feature tests for improved JIRA settings	Jarka Kadlecova	2017-06-01	2	-3/+82
\| \| \| \| \|
\| * \| \| \|	simplify test&save actions when setting a service integration	Jarka Kadlecova	2017-06-01	2	-6/+24
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Pipeline show view real time header section	Filipa Lacerda	2017-06-02	2	-11/+11
\| \|_\|/ \|/\| \|
* \| \|	Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'	Grzegorz Bizon	2017-06-02	1	-0/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow admins to delete users from the admin users page Closes #33207 See merge request !11852
\| * \| \|	Allow admins to delete users from the admin users page	Nick Thomas	2017-06-01	1	-0/+2
\| \|/ /
* \| \|	Show current user immediately in issuable filters	Winnie Hellmann	2017-06-02	2	-0/+38
\| \|/ \|/\|
* \|	Merge branch '24196-protected-variables' into 'master'	Kamil Trzciński	2017-06-01	1	-3/+45
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implementation for protected variables Closes #24196 See merge request !11688
\| * \	Merge branch 'master' into '24196-protected-variables'	Kamil Trzciński	2017-06-01	1	-0/+2
\| \|\ \ \| \| \|/ \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \|	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-06-01	12	-93/+284
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
\| * \| \|	Make sure we're loading the fresh variables	Lin Jen-Shin	2017-06-01	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688#note_31186872
\| * \| \|	Merge remote-tracking branch 'upstream/master' into 24196-protected-variables	Lin Jen-Shin	2017-05-31	23	-88/+253
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (89 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
\| * \ \ \	Merge branch 'master' into '24196-protected-variables'	Lin Jen-Shin (godfat)	2017-05-26	25	-56/+267
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \|	Fix tests and rubocop offense	Lin Jen-Shin	2017-05-25	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Frontend implementation, tests, and changelog	Lin Jen-Shin	2017-05-25	1	-1/+43
\| \| \| \| \| \|
* \| \| \| \| \|	Resolve "Improve Container Registry description"	Achilleas Pipinellis	2017-06-01	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Fix replying to a commit discussion displayed in the context of an MR	Douwe Maan	2017-06-01	1	-1/+40
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	Merge branch 'master' into 'trigger-source'	Grzegorz Bizon	2017-05-31	12	-93/+284
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \|	Merge branch 'rename-builds-controller' into 'master'	Kamil Trzciński	2017-05-31	10	-70/+242
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename BuildsController to JobsController Closes #30699 See merge request !11407
\| \| * \| \| \|	Rename the other jobsrename-builds-controller	Lin Jen-Shin	2017-05-31	1	-8/+8
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	1	-20/+37
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (63 commits) Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions Check only a merge ability for protected actions Add tag_list param to project api Allow PostReceivePack to be enabled with Gitaly Remove some deprecated methods Add :owned param to ProjectFinder ...
\| \| * \| \| \| \|	Update jobs_spec for changes from builds_spec	Lin Jen-Shin	2017-05-31	2	-496/+18
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-31	23	-88/+284
\| \| \|\ \ \ \ \ \| \| \| \| \|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (116 commits) Revert "Merge branch 'grpc-1.3.4' into 'master'" Return nil when looking up config for unknown LDAP provider Avoid crash when trying to parse string with invalid UTF-8 sequence Enable Gitaly by default in GitLab 9.3 Don’t create comment on JIRA if link already exists Disable sub_group_issuables_spec.rb for mysql Fix math rendering on blob pages Add changelog Don't allow to pass a user to ProjectWiki#http_url_to_repo Revert "Merge branch '1937-https-clone-url-username' into 'master' " Fix bottom padding for build page Fix /unsubscribe slash command creating extra todos Fix omniauth-google-oauth2 dependencies in Gemfile.lock Update looks job log 'New issue'/'New merge request' dropdowns should show only projects with issues/merge requests feature enabled Fix spec for Members::AuthorizedDestroyService 31616-add-uptime-of-gitlab-instance-in-admin-area Set head pipeline when creating merge requests Create a separate helper to check if we show particular tab on a search page Add performance deltas between app deployments on Merge Request widget ...
\| \| * \| \| \| \|	Use - as the prefix so we don't conflict with namespaces	Lin Jen-Shin	2017-05-26	5	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The decision was made around: https://gitlab.com/gitlab-org/gitlab-ce/issues/26407#note_30624641
\| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/master' into rename-builds-controller	Lin Jen-Shin	2017-05-26	123	-675/+879
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (307 commits) Address feedback Add small update for the i18n guide. update webpack to v2.6.1 patch release to fix "Can't find variable: Promise" error update webpack-bundle-analyzer past v2.4.1 to support NamedChunksPlugin name all webpack chunks to improve long term cacheability add NameAllModulesPlugin to cover shortcomings of NamedModulesPlugin upgrade to latest webpack version Only use DROP INDEX CONCURRENTLY on postgreql 9.2+ Provide default for calculating label text color (!11681) Add failing test for #32728 Bugfix: Always use the default language when generating emails. Remove unecessary commit pattern check Add regexp_for_value helper method Remove shared example and improve sub_group_issuables_spec.rb Remove 'should' from scenario in has_subgroup_title_spec.rb Cartfile git and binary methods cannot take a GitHub repo Fix terminals support for Kubernetes service Add review comments to compare_spec.rb Fix transient error clicking dropdown items in compare_spec.rb Use non-global jQuery reference within raven bundle ...
\| \| * \| \| \| \| \|	Add checks before redirect, remove status/trace	Lin Jen-Shin	2017-05-24	1	-28/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	compatible urls, which were for javascripts
\| \| * \| \| \| \| \|	Separate artifacts from builds, reusing artifacts_action_path	Lin Jen-Shin	2017-05-19	1	-6/+6
\| \| \| \| \| \| \| \|