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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Annotate the models	Zeger-Jan van de Weg	2016-05-06	72	-323/+485
\|
*	Merge branch 'log-impersonation-events' into 'master'	Stan Hu	2016-05-05	2	-0/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Log to application.log when an admin starts and stops impersonating a user Closes gitlab-org/gitlab-ee#536 See merge request !4028
\| *	Log to application.log when an admin starts and stops impersonating a user	Stan Hu	2016-05-04	2	-0/+4
\| \| \| \| \| \| \| \|	Closes gitlab-org/gitlab-ee#536
* \|	Merge branch 'fix-team-build-state-in-mr-widget' into 'master'	Stan Hu	2016-05-04	1	-10/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge request widget displays TeamCity build state and code coverage correctly again ## What does this MR do? This MR contains a fix for a regression introduced in `8.7`. In former version, the TeamCity build status was always displayed correctly. In `8.7` the build state is still checked, but the UI is not updated correctly any longer. ## Are there points in the code the reviewer needs to double check? The changes are quite simple, so please simply double check them. ## Why was this MR needed? This MR is needed to make the TeamCity build status working again. ## What are the relevant issue numbers? #17080 See merge request !3998
\| * \|	Feedback from stanhu	Benedikt Huss	2016-05-05	1	-11/+8
\| \| \|
\| * \|	Merge request widget displays TeamCity build state and code coverage ↵	Benedikt Huss	2016-05-05	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|	correctly again
* \| \|	Merge branch 'rs-repository-size-format' into 'master'	Stan Hu	2016-05-04	1	-6/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `number_to_human_size` helper to show repository size This will intelligently format large repository sizes in GBs (or, shudder, TBs). Also, removes `rescue` clause from `repository_size` helper. The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary. See merge request !4047
\| * \|	Remove `rescue` clause from `repository_size` helperrs-repository-size-format	Robert Speicher	2016-05-04	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The repository size has since become calculated (and cached) more intelligently, and this should no longer be necessary.
\| * \|	Use `number_to_human_size` helper to show repository size	Robert Speicher	2016-05-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will intelligently format large repository sizes in GBs (or, shudder, TBs).
* \| \|	Merge branch 'sanitize-new-project-error-message' into 'master'	Robert Speicher	2016-05-04	2	-1/+7
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sanitize repo paths in new project error message Closes #17243 See merge request !4029
\| * \|	Sanitize repo paths in new project error message	Stan Hu	2016-05-04	2	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #17243
* \| \|	Merge branch '17000-comment-links' into 'master'	Jacob Schatz	2016-05-04	1	-4/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove break-all from links Closes #17000 See merge request !4042
\| * \| \|	Remove break-all from links17000-comment-links	Annabel Dunstone	2016-05-04	1	-4/+0
\| \|/ /
* \| \|	Merge branch 'fix-files-page-colors' into 'master'	Jacob Schatz	2016-05-04	2	-4/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix file list page border colors See merge request !4008
\| * \| \|	Fix table bordersfix-files-page-colors	Dmitriy Zaporozhets	2016-05-02	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Use correct border color between table rows	Dmitriy Zaporozhets	2016-05-02	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'improve-milestone-ui' into 'master'	Jacob Schatz	2016-05-04	3	-8/+8
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve milestone page UI * remove button after edit button * use hex value for text color * re-use existing text color variables Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !4014
\| * \| \| \|	Improve milestone page UIimprove-milestone-ui	Dmitriy Zaporozhets	2016-05-03	3	-8/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'invalid-exists-on-new-push' into 'master'	Yorick Peterse	2016-05-04	2	-0/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expire repository exists? and has_visible_content? caches after a push if necessary See merge request !3975
\| * \| \| \|	Expire repository exists? and has_visible_content? caches after a push if ↵	Stan Hu	2016-05-04	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	necessary Closes #17012
* \| \| \| \|	Merge branch 'clean-user-profile-classes' into 'master'	Jacob Schatz	2016-05-04	1	-1/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused .contributed-projects class While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector. See merge request !3945
\| * \| \| \|	Remove unused .contributed-projects class	Karlo Soriano	2016-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While working on #13401 and trying to add a new tab to the user profile page, I came across this. I noticed that the `contributed-projects` class was only being used in order to select the div in the tests. For consistency with the other tabs, I decided to remove this class and use the div's id for the selector.
* \| \| \| \|	Merge branch 'gravatar-fix' into 'master'	Rémy Coutable	2016-05-04	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the new admin settings for gravatar Fixes gitlab-org/gitlab-ce#14826 See merge request !3988
\| * \| \| \| \|	Use the new admin settings for gravatar	Artem Sidorenko	2016-05-04	1	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'compact-files-list' into 'master'	Jacob Schatz	2016-05-04	1	-1/+1
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| / \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make files list more compact by reducing row height from 47px to 44px Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @jschatz1 @skyruler See merge request !4007
\| * \| \| \|	Make files list more compact by reducing row height from 47px to 44pxcompact-files-list	Dmitriy Zaporozhets	2016-05-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'use-rugged-to-create-tag' into 'master'	Rémy Coutable	2016-05-04	3	-40/+25
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use Rugged's TagCollection#create instead of gitlab-shell's Repository#add_tag for better performance This was originally opened at !1757 by @pcarranza but I changed it to use Rugged instead of gitlab_git, following @DouweM's request. Once this is merged, https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/26 will be mergeable too. See merge request !3745
\| * \| \| \|	Use a similar approach to branch creation for tag creationuse-rugged-to-create-tag	Rémy Coutable	2016-05-04	3	-43/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Use Rugged's TagCollection#create instead of gitlab-shell's ↵	Rémy Coutable	2016-05-04	2	-23/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repository#add_tag for better performance Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'pacoguzman/gitlab-ce-15001-since-and-until-operators-api-commits'	Douwe Maan	2016-05-04	3	-5/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile.lock
\| * \| \| \|	API support for the 'since' and 'until' operators on commit requests	Paco Guzman	2016-04-29	3	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Parameter validation as ISO8601 format
* \| \| \| \|	Merge branch 'remove-unnecessary-method-call-in-events-view' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary method call in events view Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD. See merge request !3996
\| * \| \| \| \|	Remove unnecessary method call in events view	Karlo Soriano	2016-05-01	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since `User#to_param` already returns `User#username`, we don't need to pass in the user's username. Changing this also helps us obey LoD.
* \| \| \| \|	Merge branch 'create-wikis-during-check' into 'master'	Douwe Maan	2016-05-04	1	-11/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Initialize wikis on legacy projects during check Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/4173 Helps https://gitlab.com/gitlab-org/gitlab-ce/issues/15423 See merge request !3931
\| * \| \| \| \|	Initialize wikis on legacy projects during check	Jacob Vosmaer	2016-04-26	1	-11/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'revert-devise-async' into 'master'	Rémy Coutable	2016-05-04	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Remove the Devise Async gem." This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again. Resolves #17250. See merge request !4027
\| * \| \| \| \| \|	Revert "Remove the Devise Async gem."	Connor Shea	2016-05-03	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1cc614f2bdd30b4fce35ee9e680f9272b9012978. It was causing the ActiveJob integration to fail, so unfortunately we'll have to add the gem again.
* \| \| \| \| \|	Merge branch 'rs-unique-signup-fields' into 'master'	Douwe Maan	2016-05-04	2	-2/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve uniqueness of field names on the signup form Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075 See merge request !3826
\| * \| \| \| \| \|	Improve uniqueness of field names on the signup formrs-unique-signup-fields	Robert Speicher	2016-04-19	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15075
* \| \| \| \| \| \|	Merge branch 'signout-rel-url' into 'master'	Robert Speicher	2016-05-04	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use sign out path only if not empty Fixes: https://github.com/gitlabhq/gitlabhq/issues/10066 See merge request !3989
\| * \| \| \| \| \| \|	Use sign out path only if not empty	Artem Sidorenko	2016-05-03	1	-1/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Improve the Two-factor Authentication sign-in text [ci skip]	connorshea	2016-05-03	1	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolves #14543.
* \| \| \| \| \|	Merge remote-tracking branch 'dev/master' into 'master'	Robert Speicher	2016-05-02	13	-66/+96
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Prevent privilege escalation via notes API	Robert Speicher	2016-04-26	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15577
\| * \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Marin Jankovski	2016-04-26	12	-66/+85
\| \|\ \ \ \ \ \
\| \| * \ \ \ \ \	Merge branch '15591-fix-project-leak-in-new-mr-view' into 'master'	Robert Speicher	2016-04-25	1	-0/+3
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent information disclosure via new merge request page Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15591. See merge request !1963
\| \| \| * \| \| \| \| \|	Prevent private project name and namespace from leaking in the new MR view	Rémy Coutable	2016-04-25	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #15591. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| \| * \| \| \| \| \| \|	Merge branch 'fix-impersonation-issue' into 'master'	Robert Speicher	2016-04-25	5	-46/+42
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent privilege escalation via "impersonate" feature Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15548 See merge request !1956
\| \| \| * \| \| \| \| \| \|	Store original user in variable	Douwe Maan	2016-04-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Remove unused method	Douwe Maan	2016-04-22	1	-4/+0
\| \| \| \| \| \| \| \| \| \|