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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-search-bar-search-param' into 'master'	Filipa Lacerda	2017-01-27	3	-1/+74
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix search bar search param encoding Closes #27398 See merge request !8753
\| *	Fix search bar search param encodingfix-search-bar-search-param	Clement Ho	2017-01-27	3	-1/+74
\| \|
* \|	Merge branch 'contribution-calendar-scroll' into 'master'	Clement Ho	2017-01-27	3	-1/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Contribution calendar now scrolls right by default See merge request !6192
\| * \|	Added ltr direction for the calendar contribution month row	Jose Ivan	2017-01-26	1	-2/+2
\| \| \|
\| * \|	Reverted the change from .second-block to .calender-block	Jose Ivan	2017-01-25	4	-2/+6
\| \| \|
\| * \|	Contribution calendar now scrolls right by default	José Iván	2017-01-25	1	-0/+1
\| \| \|
* \| \|	Merge branch 'ui-updates' into 'master'	Fatih Acet	2017-01-27	5	-8/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	UI updates See merge request !8669
\| * \| \|	Add tooltip to subscribe btnui-updates	Annabel Dunstone Gray	2017-01-26	1	-1/+1
\| \| \| \|
\| * \| \|	Fix subscribe btn test	Annabel Dunstone Gray	2017-01-24	1	-1/+1
\| \| \| \|
\| * \| \|	Speed up animation transition; add hover state to top right icons	Annabel Dunstone Gray	2017-01-24	3	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove subscribe text from button
\| * \| \|	Darken repo links on hover; fix clone input height	Annabel Dunstone Gray	2017-01-24	1	-2/+2
\| \| \| \|
* \| \| \|	Merge branch '23034-enable-rspec-profiling' into 'master'	Robert Speicher	2017-01-27	5	-0/+61
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add rspec_profiling to the rspec environment Closes #23034 See merge request !7854
\| * \| \| \|	Add the rspec_profiling gem and documentation to the GitLab development ↵23034-enable-rspec-profiling	Nick Thomas	2017-01-27	5	-0/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	environment
* \| \| \| \|	Merge branch 'fix-cancel-integration-settings' into 'master'	Clement Ho	2017-01-27	2	-1/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed cancel button in the services form not redirecting back to the integrations settings view Closes #27301 See merge request !8843
\| * \| \| \| \|	Fixed cancel button in the services form not redirecting back to the ↵fix-cancel-integration-settings	Jose Ivan Vargas	2017-01-27	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	integrations settings view
* \| \| \| \| \|	Merge branch '27259-label-for-references-the-wrong-associated-text-input' ↵	Annabel Dunstone Gray	2017-01-27	3	-3/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix project name label's for reference in project settings Closes #27259 See merge request !8795
\| * \| \| \| \| \|	Fix project name label's for reference in project settings27259-label-for-references-the-wrong-associated-text-input	Clement Ho	2017-01-27	3	-3/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rs-issue-27350' into 'master'	Rémy Coutable	2017-01-27	1	-14/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a transient failure in the `Explore::ProjectsController` spec Closes #27350 See merge request !8847
\| * \| \| \| \| \| \|	Fix a transient failure in the `Explore::ProjectsController` specrs-issue-27350	Robert Speicher	2017-01-27	1	-14/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'speed-up-members-dropdown' into 'master'	Douwe Maan	2017-01-27	1	-3/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't call `#uniq` on a relation See merge request !8784
\| * \| \| \| \| \| \| \|	Don't call `#uniq` on a relation	Sean McGivern	2017-01-27	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When there was no project, no search, and no current user or author param, the AutocompleteController would call `#uniq!` on a relation instead of an array. This performed the less-efficient `SELECT DISTINCT` when it wasn't even needed (because the query wouldn't return duplicates anyway - duplicates were only added by putting a user on top of the list).
* \| \| \| \| \| \| \| \|	Merge branch '26947-build-status-self-link' into 'master'	Kamil Trzciński	2017-01-27	4	-3/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use new partial to render a badge without a link in the builds details. Closes #26947 See merge request !8740
\| * \| \| \| \| \| \| \| \|	Use badge partial as single source of truth instead of having 2 partials ↵26947-build-status-self-link	Filipa Lacerda	2017-01-27	9	-19/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	doing the same Update changelog description Changes after review
\| * \| \| \| \| \| \| \| \|	Changes after review	Filipa Lacerda	2017-01-27	2	-3/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adds tests to build view	Filipa Lacerda	2017-01-27	3	-3/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix CHANGELOG entry
\| * \| \| \| \| \| \| \| \|	Use new partial to render a badge without a link in the builds details. ↵	Filipa Lacerda	2017-01-27	8	-14/+23
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Preventing from having a link to itself. Adds MR ID to CHANGELOG entry
* \| \| \| \| \| \| \| \|	Merge branch 'mr-tabs-container-offset' into 'master'	Annabel Dunstone Gray	2017-01-27	4	-13/+24
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request tabs extra margin Closes #26853 See merge request !8841
\| * \| \| \| \| \| \| \|	Fixed merge request tabs extra margin	Phil Hughes	2017-01-27	4	-13/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed extra margin when the merge request tabs are affixed This was caused by some weird padding that was on the container & then not correctly removed. The fix involved removing the container from inside the tabs holder div & then adding the widths through CSS depending on if fixed & whether the parent is limited width or not. In reality out container classes need to be fixed as it is getting pretty un-managable at the moment this should of been an easy fix, but in reality turned into something much harder. Closes #26853
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-annotated-tags-pointing-to-blob' into 'master'	Douwe Maan	2017-01-27	3	-1/+40
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when repositories contain annotated tags pointing to blobs Closes #27228 See merge request !8800
\| * \| \| \| \| \| \| \|	Fix Error 500 when repositories contain annotated tags pointing to blobssh-fix-annotated-tags-pointing-to-blob	Stan Hu	2017-01-26	3	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In repositories such as https://github.com/git/git.git, annotated tags can point to blobs, not necessarily to commits. `Repository` attempts to return the tags in the order of the commit date, but if a commit is not available the previous implementation would error due to a `nil` target. This change modifies the code to use the current time if a commit is not associated with the given tag. Closes #27228
* \| \| \| \| \| \| \| \|	Merge branch ↵26900-pipelines-tabs-equal-builds	Rémy Coutable	2017-01-27	2	-228/+91
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'get-rid-of-water-from-notification_service_spec-to-make-it-DRY' into 'master' Make notification_service spec DRYer by making some tests reusable See merge request !7794
\| * \| \| \| \| \| \| \|	Make notification_service spec DRYer by making some tests reusable	YarNayar	2016-12-12	2	-228/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The spec for 'participatns' notifications in notification_service for both issue and merge_request is pretty simple but it was fully copied without sagnificant changes 8 times (!!!) for EVERY situation you need to notify this group of user which caused to file to extra growth and not being very DRY. And I love DRY. Since the spec is already too messy and most likely gonna to increase the size nearest time, I decided to refactor those parts.
* \| \| \| \| \| \| \| \|	Merge branch '26943-fix-user-in-build-presenter' into 'master'	Robert Speicher	2017-01-27	7	-21/+29
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't override Ci::Build#user when presenting a build Closes #26943 See merge request !8668
\| * \| \| \| \| \| \| \| \|	Raise Gitlab::View::Presenter::CannotOverrideMethodError if presentee ↵26943-fix-user-in-build-presenter	Rémy Coutable	2017-01-25	3	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	already respond to method Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \| \| \|	Don't override presentee methods for Gitlab::View::Presenter::Delegated	Rémy Coutable	2017-01-24	6	-22/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \|	Merge branch 'gemfile-development-guideline' into 'master'	Stan Hu	2017-01-27	2	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document "No gems fetched from git repositories" policy [ci skip] See merge request !8818
\| * \| \| \| \| \| \| \| \| \|	Document "No gems fetched from git repositories" policy [ci skip]	Adam Niedzielski	2017-01-27	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-models' into 'master'	Rémy Coutable	2017-01-27	66	-146/+148
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in model specs See merge request !8832
\| * \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in model specsrs-empty_project-models	Robert Speicher	2017-01-26	66	-146/+148
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rs-empty_project-requests' into 'master'	Rémy Coutable	2017-01-27	17	-44/+44
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in request specs See merge request !8833
\| * \| \| \| \| \| \| \| \| \| \| \|	Use `:empty_project` where possible in request specsrs-empty_project-requests	Robert Speicher	2017-01-26	17	-44/+44
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-ci-php-npm' into 'master'	Rémy Coutable	2017-01-27	2	-0/+162
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added PHP & NPM samples for Gitlab CI See merge request !6199
\| * \| \| \| \| \| \| \| \| \| \| \|	Typos	Ionut Staicu	2017-01-27	1	-12/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Small gramatical tweaks	Ionut Staicu	2017-01-27	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Typos	Ionut Staicu	2017-01-27	1	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Added PHP & NPM doc	Ionut Staicu	2017-01-27	2	-0/+156
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'depr-devise-test-fixed' into 'master'	Rémy Coutable	2017-01-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix depr. warning; use `Devise::Test::ControllerHelpers` Closes #26942 See merge request !8812
\| * \| \| \| \| \| \| \| \| \| \| \|	fix depr. warning; use `Devise::Test::ControllerHelpers`	Adam Pahlevi	2017-01-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'issue_27211' into 'master'	Rémy Coutable	2017-01-27	2	-6/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused js response from refs controller Closes #27211 See merge request !8828
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused js response from refs controllerissue_27211	Felipe Artur	2017-01-26	2	-6/+4
\| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \|