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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Bitbucket importer.	Douwe Maan	2015-02-24	35	-54/+522
\|
*	Merge branch 'profile_tooltip_addition' into 'master'	Marin Jankovski	2015-02-24	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Profile tooltip For consistency sake, the profile in the navbar has a tooltip. Fixes #2007 See merge request !1572
\| *	Added Profile tooltip	Sabba Petri	2015-02-23	1	-1/+1
\| \| \| \| \| \| \| \|	For consistency sake, the profile in the navbar has a tooltip.
* \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-02-23	7	-11/+29
\|\ \
\| * \	Merge pull request #8760 from yglukhov/diff-sticky-headers	Dmitriy Zaporozhets	2015-02-23	3	-0/+12
\| \|\ \ \| \| \| \| \| \| \| \|	Diff headers made sticky
\| \| * \|	Diff headers made sticky	yglukhov	2015-02-09	3	-0/+12
\| \| \| \|
\| * \| \|	Merge pull request #8180 from Bugagazavr/mr_update	Dmitriy Zaporozhets	2015-02-23	1	-3/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Trigger merge request hook when source updated
\| \| * \| \|	Trigger merge request hook when source updated	Kirill Zaitsev	2014-12-09	1	-3/+9
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8782 from jvanbaarsen/no-test-class-caching	Dmitriy Zaporozhets	2015-02-23	1	-1/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Don't cache classes in tests
\| \| * \| \| \|	Don't cache classes in tests	Jeroen van Baarsen	2015-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| * \| \| \| \|	Merge pull request #8783 from jvanbaarsen/spring-update	Dmitriy Zaporozhets	2015-02-23	2	-6/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated spring
\| \| * \| \| \| \|	Updated spring	Jeroen van Baarsen	2015-02-12	2	-6/+6
\| \| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
\| * \| \| \| \|	Merge pull request #8798 from jirutka/update-charlock_holmes	Dmitriy Zaporozhets	2015-02-23	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update charlock_holmes to 0.7.3
\| \| * \| \| \| \|	Update charlock_holmes to 0.7.3	Jakub Jirutka	2015-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version 0.6.9.4 fails to install on Gentoo Linux.
* \| \| \| \| \| \|	Merge branch 'improve-sidebar' into 'master'	Dmitriy Zaporozhets	2015-02-24	3	-9/+5
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve sidebar menu for project settings See merge request !1582
\| * \| \| \| \| \|	Improve sidebar menu for project settings	Dmitriy Zaporozhets	2015-02-23	3	-9/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bump-gitlab-shell-2-5-4' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab-shell to 2.5.4 For #2042 See merge request !1584
\| * \| \| \| \| \| \|	Bump gitlab-shell to 2.5.4	Dmitriy Zaporozhets	2015-02-23	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Update version of gitlab-shell in the installation and update documentation.	Marin Jankovski	2015-02-23	3	-6/+6
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'ldap-need-no-password' into 'master'	Marin Jankovski	2015-02-24	3	-2/+7
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	LDAP users don't need to set a password to Git over HTTP. Fixes https://github.com/gitlabhq/gitlabhq/issues/8846. See merge request !1575
\| * \| \| \| \| \| \|	LDAP users don't need to set a password to Git over HTTP.	Douwe Maan	2015-02-23	3	-2/+7
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix_url_links_for_gitlab_issue_tracker' into 'master'	Dmitriy Zaporozhets	2015-02-24	4	-16/+89
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using gitlab url to build links for gitlab issue tracker and add a spec. Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/1107 This needs to go to master as the paths changed since rails upgrade Fix for stable branch is in https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1574/ See merge request !1573
\| * \| \| \| \| \| \|	Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ↵	Marin Jankovski	2015-02-23	4	-16/+89
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rubocop warnings in path.
* \| \| \| \| \| \|	Merge branch 'improve-services-migration' into 'master'	Marin Jankovski	2015-02-24	1	-9/+15
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make services migration more reliable Fix for #2045 . I did not use SQL because its hard to convert SQL fields into json with interpolation and without errors. SO I just improved current migration with next: * skip validation to prevent exception because of new `template` field in validation * check column for existance before adding them. It should allow people who already failed this migration to re-run ti * select objects with 500 batch size for better memory usage Tested on migration from 7.0 to 7.9.0.pre See merge request !1581
\| * \| \| \| \| \| \|	Make services migration more reliable	Dmitriy Zaporozhets	2015-02-23	1	-9/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-avatar-access' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-0/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow non authenticated access to avatars For #2047 cc @douwe See merge request !1583
\| * \| \| \| \| \| \| \|	Allow non authenticated access to avatars	Dmitriy Zaporozhets	2015-02-23	1	-0/+9
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Better readme title	Dmitriy Zaporozhets	2015-02-23	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'warn-against-stable-branch-changelog' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-0/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure that people don't view the changelog on the stable branch because we don't update that one. See merge request !1568
\| * \| \| \| \| \| \|	Ensure that people don't view the changelog on the stable branch because we ↵	Sytse Sijbrandij	2015-02-22	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	don't update that one.
* \| \| \| \| \| \| \|	Merge branch 'api-empty-commit' into 'master'	Dmitriy Zaporozhets	2015-02-24	7	-19/+66
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve error messages when file editing fails Give more specific errors in API responses and web UI flash messages when a file update fails. See #1479. Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push. @dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService` cc @sytse See merge request !1569
\| * \| \| \| \| \| \| \|	Improve error messages when file editing fails	Vinnie Okada	2015-02-22	7	-19/+66
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Give more specific errors in API responses and web UI flash messages when a file update fails.
* \| \| \| \| \| \| \|	Merge branch 'fix-commit-zen-mode' into 'master'	Dmitriy Zaporozhets	2015-02-24	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ZenMode on commit show and milestone edit pages. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110 See merge request !1557
\| * \| \| \| \| \| \|	Initialize ZenMode on commit show and milestone edit pages.	Douwe Maan	2015-02-21	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix markdown image uploader after rails update	Dmitriy Zaporozhets	2015-02-23	1	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix style issue for rubocop	Dmitriy Zaporozhets	2015-02-23	1	-8/+12
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'git_clone_holder_btn' into 'master'	Marin Jankovski	2015-02-23	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git Clone btn more apparent Added a faint background to the button to show that it is in an active state for the user. White background is often hard to tell if something is being pushed, so adding a "shadow" makes it a bit easier to tell. Fixes #1998 See merge request !1577
\| * \| \| \| \| \| \|	Git Clone btn more apparent	Sabba Petri	2015-02-23	1	-0/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added a faint background to the button to show that it is in an active state for the user. White background is often hard to tell if something is being pushed, so adding a "shadow" makes it a bit easier to tell. Fixes #1998
* \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-02-23	3	-4/+4
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Robert Schilling	2015-02-23	2	-3/+3
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'master' into 'master'	Robert Schilling	2015-02-23	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GitLab for Docker to version 7.8.0 See merge request !347
\| \| \| * \| \| \| \| \| \|	Bump GitLab for Docker to version 7.8.0	shafan	2015-02-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'spelling-correction' into 'master'	Robert Schilling	2015-02-23	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small spelling correction There's a small spelling error on the project settings page. 'an project' is not correct English. See merge request !348
\| \| \| * \| \| \| \| \| \|	Correct spelling of 'a project avatar'	Marco Wessel	2015-02-23	1	-1/+1
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #8841 from patschi/patch-1	Robert Schilling	2015-02-23	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Update 7.7-to-7.8.md
\| \| * \| \| \| \| \| \|	Update 7.7-to-7.8.md	Patrik Kernstock	2015-02-22	1	-1/+1
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Fix git-over-http	Dmitriy Zaporozhets	2015-02-23	1	-0/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Fix updating issue 500 error	Dmitriy Zaporozhets	2015-02-22	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fix dashboard for projects > 30	Dmitriy Zaporozhets	2015-02-22	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Remove unreleased for 7.8 in changelog.	Sytse Sijbrandij	2015-02-22	1	-1/+1
\| \| \| \| \| \|