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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Remove project_labels from Projects::ApplicationController	Douglas Barbosa Alexandre	2016-10-19	8	-48/+88
\| \| \| \| \| \|
\| * \| \| \| \|	LabelsFinder inherits from UnionFinder	Douglas Barbosa Alexandre	2016-10-19	1	-9/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Replace label references with links for group labels	Douglas Barbosa Alexandre	2016-10-19	1	-3/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Remove unused method LabelsHelper#project_label_names	Douglas Barbosa Alexandre	2016-10-19	1	-4/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Validates uniqueness of title unless label is a template	Douglas Barbosa Alexandre	2016-10-19	2	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	List group labels on project labels page	Douglas Barbosa Alexandre	2016-10-19	18	-89/+226
\| \| \| \| \| \|
\| * \| \| \| \|	Allow user to create a board list based on a group label	Douglas Barbosa Alexandre	2016-10-19	4	-2/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Allow users to apply group labels on Issues/MRs	Douglas Barbosa Alexandre	2016-10-19	11	-20/+60
\| \| \| \| \| \|
\| * \| \| \| \|	Add LabelsFinder	Douglas Barbosa Alexandre	2016-10-19	1	-0/+58
\| \| \| \| \| \|
\| * \| \| \| \|	Add CRUD for Group Labels	Douglas Barbosa Alexandre	2016-10-19	13	-5/+238
\| \| \| \| \| \|
\| * \| \| \| \|	Add GroupLabel model	Douglas Barbosa Alexandre	2016-10-19	7	-0/+44
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'dropdowns-should-drop-down' into 'master'	Jacob Schatz	2016-10-19	1	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove show_menu_above attribute from issuable dropdowns. Removes `show_menu_above` attribute form issueable dropdowns so they will drop down. Fixes #23425 and #23317 See merge request !7001
\| * \| \| \| \|	Remove show_menu_above attribute from issuable dropdowns.	Fatih Acet	2016-10-19	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'dz-refactor-project-members-controller-spec' into 'master'	Sean McGivern	2016-10-19	2	-119/+77
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor project_members_controller_spec Make tests more readable, DRY and closer to RSpec best practices. Same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6985 but for project_members_controller_spec now See merge request !6989
\| * \| \| \| \| \|	Change the order of tested methods in project_members_controller_spec	Dmitriy Zaporozhets	2016-10-19	1	-44/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Refactor project_members_controller_specdz-refactor-project-members-controller-spec	Dmitriy Zaporozhets	2016-10-19	2	-78/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'adam-fix-ruby-2-1-cycle-analytics' into 'master'	Douwe Maan	2016-10-19	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Hash rocket syntax to fix cycle analytics under Ruby 2.1 Refers to #23510 See merge request !6977
\| * \| \| \| \| \| \|	Spaces before `}`!adam-fix-ruby-2-1-cycle-analytics	Douwe Maan	2016-10-19	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use Hash rocket syntax to fix cycle analytics under Ruby 2.1	Adam Niedzielski	2016-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refers to #23510
* \| \| \| \| \| \| \|	Merge branch 'dz-start-8-14' into 'master'	Dmitriy Zaporozhets	2016-10-19	2	-1/+3
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Its time for 8.14 in master See merge request !6998
\| * \| \| \| \| \| \|	Its time for 8.14 in masterdz-start-8-14	Dmitriy Zaporozhets	2016-10-19	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'issue_828' into 'master'	Douwe Maan	2016-10-19	16	-83/+199
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728
\| * \| \| \| \| \| \| \|	Prevent wrong markdown on issue ids when project has Jira service activatedissue_828	Felipe Artur	2016-10-19	16	-83/+199
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-omniauth-saml' into 'master'	Douwe Maan	2016-10-19	2	-5/+5
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump `omniauth-saml` to 1.7.0 Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration. cc @dblessing @dewetblomerus See merge request !6997
\| * \| \| \| \| \| \| \| \|	Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support ↵update-omniauth-saml	Patricio Cano	2016-10-19	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for IdP auto-configuration.
* \| \| \| \| \| \| \| \| \|	Merge branch ↵	Robert Speicher	2016-10-19	3	-2/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master' `Reset filters` link should only be visible when filters are active ## Why was this MR needed? `Reset filters` link is always visible. Closes #22457 See merge request !6497
\| * \| \| \| \| \| \| \| \| \|	Added `issuable_filters_present` to check for active filters before ↵22457-reset-filters-button-should-be-invisible-when-no-filters-are-active	Luke Bennett	2016-10-07	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rendering the reset button Added tests
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dont-touch-fs-on-pipeline-save' into 'master'	Rémy Coutable	2016-10-19	2	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep around commits only on pipeline create ## What does this MR do? Since the pipeline SHA doesn't change, we don't need to update keep arounds every save. ## Why was this MR needed? This is minimal change to fix this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23503 See merge request !6986
\| * \| \| \| \| \| \| \| \| \|	Keep around commits only on pipeline createdont-touch-fs-on-pipeline-save	Kamil Trzcinski	2016-10-19	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch '21444-pipeliens-new-mr' into 'master'	Fatih Acet	2016-10-19	5	-38/+75
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
\| * \| \| \| \| \| \| \| \| \| \|	Improve code that creates a list of commits for MR21444-pipeliens-new-mr	Grzegorz Bizon	2016-10-18	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Extend merge request tests for all commits method	Grzegorz Bizon	2016-10-18	2	-20/+45
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Use temporary compare commits when MR not persisted	Grzegorz Bizon	2016-10-18	1	-11/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Extract pipeline vars in merge requests controller	Grzegorz Bizon	2016-10-18	2	-6/+14
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Use all pipelines variable when creating merge request	Grzegorz Bizon	2016-10-18	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Remove obsolete variable assigned to MR widget view	Grzegorz Bizon	2016-10-18	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix variable to show multiple pipelines for MR	Annabel Dunstone Gray	2016-10-18	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix pipeline tab content display and badge count	Annabel Dunstone Gray	2016-10-18	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add pipelines tab to new MR	Annabel Dunstone	2016-10-18	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix/fix-public-builds-name-in-pipeline-settings' into 'master'	Achilleas Pipinellis	2016-10-19	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix name of feature that restricts access to builds traces ## What does this MR do? This MR fixes the name of the feature that makes it possible to restrict build traces. This does not disable access to pipelines. Pipelines are still available so we should tie the name with builds, instead of using work "pipeline" there. See merge request !6980
\| * \| \| \| \| \| \| \| \| \| \|	Fix name of feature that restricts builds tracesfix/fix-public-builds-name-in-pipeline-settings	Grzegorz Bizon	2016-10-19	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'corrected-build-page-header-username-to-full-name' into 'master'	Jacob Schatz	2016-10-19	1	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed build header username area to use the full name with the username as the tooltip ## What does this MR do? Changes build header username to use the full name with the username as the tooltip. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? UI consistency ## Screenshots (if relevant) ![2016-09-08_19.24.22](/uploads/958422819ae3057f1499b2686d83e326/2016-09-08_19.24.22.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Contributes to #21832 See merge request !6272
\| * \| \| \| \| \| \| \| \| \| \|	Change username full name back to only username on xs viewportscorrected-build-page-header-username-to-full-name	Luke Bennett	2016-09-08	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Changed build header username area to use the full name with the username as ↵	Luke Bennett	2016-09-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the tooltip
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-escaping' into 'master'	Sean McGivern	2016-10-19	3	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix: commit messages being double-escaped in activities tab See merge request !6937
\| * \| \| \| \| \| \| \| \| \| \| \|	fix: commit messages being double-escaped in activies tab	amaia	2016-10-18	3	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-revert-title-change' into 'master'	Douwe Maan	2016-10-19	5	-5/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert issuable title reordering Reverts !6503, and uses `to_reference` rather than `iid` for `Issues#show` and `Issues#edit` titles. See merge request !6983
\| * \| \| \| \| \| \| \| \| \| \| \|	Use `to_reference` for Issue "show" and "edit" page titlesrs-revert-title-change	Robert Speicher	2016-10-19	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks to Greg Laubenstein for noticing in !6503
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch ↵	Robert Speicher	2016-10-19	5	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'" This reverts commit 434d98b22a6381447a9c59cec16fc324ade198df, reversing changes made to b6a83be65f6711a3cf808400c549bdd3ec7eda74.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'dz-refactor-some-specs' into 'master'	Sean McGivern	2016-10-19	2	-86/+35
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor group_members_controller_spec Make tests more readable, DRY and closer to RSpec best practices. See merge request !6985