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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'sh-dashboard-sort-fix' into 'master'	Douwe Maan	2018-03-06	1	-0/+8
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix project dashboard showing the wrong timestamps Closes #27181 See merge request gitlab-org/gitlab-ce!17504
\| *	Fix project dashboard showing the wrong timestampssh-dashboard-sort-fix	Stan Hu	2018-03-05	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the max of the `last_activity_at` and `last_repository_updated_at` columns. The latter is updated only when a push happens, but the former is updated whenever any activity (e.g. issue creation) happens. Closes #27181
* \|	Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵	Rémy Coutable	2018-03-06	4	-16/+129
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
\| * \|	Add overview of branches and a filter for active/stale branches	Takuya Noguchi	2018-03-06	4	-16/+129
\| \| \|
* \| \|	Merge branch 'fix/sm/fix_pages_worker' into 'master'	Kamil Trzciński	2018-03-06	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload stable object to prevent erase artifacts with old state (Ver 2) Closes #43641 See merge request gitlab-org/gitlab-ce!17522
\| * \| \|	Revert unnecessary code running_or_pending_build_count removal	Shinya Maeda	2018-03-06	1	-0/+2
\| \| \| \|
\| * \| \|	Introduce FailedToExtractError. Fix spec. Add DNS test mock.	Shinya Maeda	2018-03-06	2	-3/+1
\| \| \| \|
* \| \| \|	Merge branch '38587-pipelines-empty-state' into 'master'	Phil Hughes	2018-03-06	1	-5/+34
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Pipelines view should handle empty state and buttons properly" Closes #38587 See merge request gitlab-org/gitlab-ce!17433
\| * \| \|	[ci skip] Merge branch 'master' into 38587-pipelines-empty-state	Filipa Lacerda	2018-03-05	2	-3/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (52 commits) Projects and groups badges API Keep a commit around if its sha is present #43691: DiffNotes not counted by ContributionsCalendar Cleanup after adding MR diff's commit_count Fix MR merge commit cross-references to the MR itself Fix n+1 issue by not reloading fully loaded blobs Add "added" type on changelog Use limited count queries also for scoped searches Update changelog Rename quick actions handler Adds updated_at filter to issues and merge_requests API Update API: add search param to branches Add changelog entry LabelsSelect DropdownValueCollapsed Component LabelsSelect DropdownValue Component LabelsSelect DropdownTitle Component LabelsSelect DropdownSearchInput Component LabelsSelect DropdownHiddenInput Component LabelsSelect DropdownHeader Component LabelsSelect DropdownFooter Component ...
\| * \| \| \|	Manage empty states in Pipelines page	Filipa Lacerda	2018-03-05	1	-5/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds i18n Adds test Fix broken tests Fixes empty tab state for external CI
* \| \| \| \|	Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'	Robert Speicher	2018-03-05	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
\| * \| \| \| \|	CI/CD-only projects FE	Eric Eastwood	2018-03-05	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
* \| \| \| \|	Merge branch 'dz-use-less-deprecated-methods' into 'master'	Douwe Maan	2018-03-05	16	-29/+29
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
\| * \| \| \|	Replace deprecated name_with_namespace with full_name in app and spec	Dmitriy Zaporozhets	2018-03-05	16	-28/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Replace deprecated path_with_namespace with full_path	Dmitriy Zaporozhets	2018-03-05	1	-1/+1
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'jprovazn-count-cleanup' into 'master'43739-gl_repository-not-set-when-merging-merge-requests-from-the-web-ui	Robert Speicher	2018-03-05	1	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup after adding MR diff's commit_count Closes #41698 See merge request gitlab-org/gitlab-ce!17513
\| * \| \| \|	Cleanup after adding MR diff's commit_count	Jan Provaznik	2018-03-05	1	-0/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* processes any pending records which are not migrated yet * bumps import_export version because of new commits_count attribute * removes commits_count fallback method
* \| \| \|	Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵	Rémy Coutable	2018-03-05	1	-3/+0
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
\| * \| \|	Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action	Sean McGivern	2018-03-02	1	-3/+0
\| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
* \| \|	Remove IDE from CE	Phil Hughes	2018-03-02	3	-157/+0
\|/ /
* \|	Remove u2f webpack bundle	Mike Greiling	2018-03-01	1	-4/+0
\| \|
* \|	Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'	Douwe Maan	2018-03-01	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
\| * \|	Moved o_auth/saml/ldap modules under gitlab/auth	Horatiu Eugen Vlad	2018-02-28	1	-1/+1
\| \| \|
* \| \|	Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'	Douwe Maan	2018-03-01	1	-15/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Include cycle time in usage ping" Closes #41777 See merge request gitlab-org/gitlab-ce!16793
\| * \| \|	Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping	Tiago Botelho	2018-03-01	1	-3/+3
\| \| \| \|
\| * \| \|	Refactors median code to work with both single and multiple projects	Tiago Botelho	2018-02-28	1	-12/+2
\| \| \|/ \| \|/\|
* \| \|	Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'	Kamil Trzciński	2018-03-01	1	-13/+25
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
\| * \| \|	Fix feature spec Clusters Applications (#17052)42643-persist-external-ip-of-ingress-controller-gke	Dylan Griffith	2018-03-01	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to actually wait for the "Install" button to be enabled before clicking it otherwise we have a race condition where it sometimes works. Also change the `expect(page.find(...))` to `expect(page).to have_css` as this is prefered to avoid race conditions
\| * \| \|	Fix spec/features/projects/clusters/applications_spec.rb (#42643)>	Dylan Griffith	2018-02-23	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also remove the flakiness by using `expect(page).to have_css(..., exact_text: '')` instead of `expect(page.find(...).text).to eq('')` since the former will wait until the text has this value while the latter will only wait for the element to exist then test its text straight away which introduces a race condition if the element is already there with a previous text value. This test was failing locally most of the time because of this other way of asserting.
\| * \| \|	Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke	Dylan Griffith	2018-02-23	14	-334/+713
\| \|\ \ \
\| * \| \| \|	Use value attribute in ip input	Filipa Lacerda	2018-02-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes double quoted string
\| * \| \| \|	Remove duplicate ID	Filipa Lacerda	2018-02-20	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke	Filipa Lacerda	2018-02-20	1	-0/+108
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (30 commits) Docs: Pages - clean up articles Only use features for events Put all event metrics exposed to prometheus behind a feature flag Add version which LFS lock was introduced Remove unecessary validate: true from belongs_to :project fix broken specs remove common_d3 bundle remove graphs_show webpack bundle Chart.html.haml refactor Remove extraneous tests from Issues API spec [GH Import] Create an empty wiki if wiki import failed Resolve "group request membership mail with too long list of "To:"" Add changelog entry Fix single digit value clipping specify date format Increase feature flag cache TTL to one hour Convert Gitaly commit parent IDs to array as early as possible Clarify changelog for squash encoding fix Avoid slow File Lock checks when not used Fix squash rebase not working when diff contained encoded data ...
\| * \| \| \| \|	Update feature spec for kubernetes applications ingress IP address (#42643)	Dylan Griffith	2018-02-20	1	-0/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Removing the two factor check when the user sets a new password	Francisco Javier López	2018-03-01	1	-0/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Remove pipelines mini graph spec that wasn't actually testing anythingsh-issue-43636	Stan Hu	2018-02-28	1	-17/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was also causing crashes in Chrome V64, so it's best to remove it for now. Closes #43636
* \| \| \| \| \|	PagesDomain: Add edit/update functionality	Rob Watson	2018-02-28	1	-0/+31
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Render MR Notes with Vue with behind a cookie	Fatih Acet	2018-02-28	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rc/reduce-delta-with-ce-in-controllers-ce' into 'master'	Douwe Maan	2018-02-27	1	-0/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove explicit audit event log in MembershipActions See merge request gitlab-org/gitlab-ce!14824
\| * \| \| \| \|	Move the #update action from Project/Member controllers to the ↵	Rémy Coutable	2018-02-27	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch '24774-clear-the-Labels-dropdown-search-filter' into 'master'	Phil Hughes	2018-02-27	1	-0/+12
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clear "Labels" dropdown search filter after selection Closes #24774 See merge request gitlab-org/gitlab-ce!17393
\| * \| \| \| \|	Add test for label search behaviour24774-clear-the-Labels-dropdown-search-filter	Kushal Pandya	2018-02-27	1	-0/+12
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵	Grzegorz Bizon	2018-02-27	1	-43/+81
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
\| * \| \| \| \|	Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups	Sean McGivern	2018-02-27	1	-43/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* \| \| \| \| \|	Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ↵	Mayra Cabrera	2018-02-26	2	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-> edit Prometheus Service Template"
* \| \| \| \| \|	Fixed issue edit shortcut not workingissue-edit-shortcut	Phil Hughes	2018-02-26	1	-0/+12
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was caused by the element getting cached on the class before the Vue app has finished rendering. Closes #43560
* \| \| \| \|	Get rid of hard-coded user/project/group names that could clash with DB ↵	Rémy Coutable	2018-02-26	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sequences Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'refactor/move-filtered-search-vue-component' into 'master'	Clement Ho	2018-02-24	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move RecentSearchesDropdownContent vue component See merge request gitlab-org/gitlab-ce!16951
\| * \| \| \| \|	Move RecentSearchesDropdownContent vue component	George Tsiolis	2018-02-22	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '29497-pages-custom-domain-dns-verification' into 'master'	Robert Speicher	2018-02-23	1	-2/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Domain validation for Pages custom domains" (master branch) Closes #29497, #42971, and #42083 See merge request gitlab-org/gitlab-ce!17311