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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Spin icon next to "Checking for CI status..."spinner-spin	Douwe Maan	2015-05-14	2	-6/+7
\|
*	Merge branch 'upgrade-dockerfile-apt' into 'master'	Sytse Sijbrandij	2015-05-14	2	-15/+12
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use apt repositories to upgrade Docker images to the latest versions Reduces the need to bump versions periodically. See merge request !647
\| *	Use apt repositories to upgrade Docker builds to the latest GitLab version	Stan Hu	2015-05-13	2	-15/+12
\| \| \| \| \| \| \| \|	Reduces the need to bump versions periodically.
* \|	GitLab shell version to 2.6.3.	Marin Jankovski	2015-05-14	1	-1/+1
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-05-14	1	-1/+1
\|\ \ \| \|/
\| *	Merge requests are welcome in spite of the deprecation.	Sytse Sijbrandij	2015-05-13	1	-1/+1
\| \|
* \|	Merge branch 'sidekiq-sigkill' into 'master'	Dmitriy Zaporozhets	2015-05-13	2	-1/+2
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use SIGKILL by default in Sidekiq::MemoryKiller This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM. See merge request !1824
\| *	Use SIGKILL by default in Sidekiq::MemoryKiller	Jacob Vosmaer	2015-05-13	2	-1/+2
\|/ \| \| \| \| \| \|	This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM.
*	Fix text overflow in project sidebar	Dmitriy Zaporozhets	2015-05-13	1	-0/+4
\|
*	Merge branch 'text-batch-1' into 'master'	Dmitriy Zaporozhets	2015-05-13	14	-84/+98
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch 1 of text improvements Batch 1 of changes from my effort at !635 to walk through every piece of text in GitLab and see if it can be improved. This batch includes: - Improve text on error pages. - Improve Git access error messages. - Improve description of branch protection levels. - Improve OAuth signup error message. - Improve OAuth application flash messages. cc @rspeicher See merge request !642
\| *	Fix GitAccess.text-batch-1	Douwe Maan	2015-05-13	2	-13/+6
\| \|
\| *	Fix 422 error page.	Douwe Maan	2015-05-13	1	-1/+1
\| \|
\| *	Improve OAuth application flash messages.	Douwe Maan	2015-05-13	1	-5/+5
\| \|
\| *	Improve OAuth signup error message.	Douwe Maan	2015-05-13	2	-4/+11
\| \|
\| *	Improve description of branch protection levels.	Douwe Maan	2015-05-13	1	-3/+3
\| \|
\| *	Improve Git access error messages.	Douwe Maan	2015-05-13	3	-45/+44
\| \|
\| *	Improve text on error pages.	Douwe Maan	2015-05-13	6	-17/+32
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-13	1	-6/+15
\|\ \
\| * \|	remove strange code branchets	Sytse Sijbrandij	2015-05-13	1	-1/+1
\| \| \|
\| * \|	Deprecate the upgrader script since we forget to update it.	Sytse Sijbrandij	2015-05-13	1	-5/+14
\| \| \|
* \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-05-13	10	-221/+275
\|\ \ \
\| * \ \	Merge pull request #9276 from jirutka/relative_link_filter	Dmitriy Zaporozhets	2015-05-13	6	-218/+242
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Extract handling of relative file links to its own HTML filter
\| \| * \| \|	Add spec for RelativeLinkFilter	Jakub Jirutka	2015-05-12	2	-73/+120
\| \| \| \| \|
\| \| * \| \|	RelativeLinkFilter: refactor according to suggestions by @tsigo	Jakub Jirutka	2015-05-11	2	-17/+13
\| \| \| \| \|
\| \| * \| \|	Extract handling of relative file links to RelativeLinkFilter	Jakub Jirutka	2015-05-11	4	-145/+126
\| \| \| \| \|
\| * \| \| \|	Merge pull request #8872 from baloo/feature/execute_mr_webhooks_upon_commit	Jeroen van Baarsen	2015-05-13	4	-3/+33
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|	Call merge request web hook for each commits
\| \| * \| \|	Call merge request web hook for each commits	Arthur Gautier	2015-05-13	4	-3/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Call merge request web hook every times a new commit hits the source branch Signed-off-by: Arthur Gautier <baloo@gandi.net>
* \| \| \| \|	Merge branch 'version-check' into 'master'	Dmitriy Zaporozhets	2015-05-13	9	-10/+46
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version check See merge request !1509
\| * \| \| \|	Enable version check only for production environment	Dmitriy Zaporozhets	2015-05-11	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Replace host with real one	Dmitriy Zaporozhets	2015-05-11	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Fix syntax error	Dmitriy Zaporozhets	2015-05-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'version-check' into gl-version-check	Dmitriy Zaporozhets	2015-05-08	9	-10/+45
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/controllers/admin/application_settings_controller.rb app/views/admin/application_settings/_form.html.haml db/schema.rb
\| \| * \| \| \|	Remove unnecessary public key	Dmitriy Zaporozhets	2015-05-08	2	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Remove encryption	Dmitriy Zaporozhets	2015-05-08	4	-24/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \|	Add feature to disable version check	Dmitriy Zaporozhets	2015-03-10	6	-5/+20
\| \| \| \| \| \|
\| \| * \| \| \|	Add version check to help page too	Dmitriy Zaporozhets	2015-03-09	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Prevent crash if file does not exists	Dmitriy Zaporozhets	2015-03-09	1	-1/+3
\| \| \| \| \| \|
\| \| * \| \| \|	Add version check badge to admin area	Dmitriy Zaporozhets	2015-03-09	3	-1/+40
\| \| \| \| \| \|
\| \| * \| \| \|	Add simple_encrypt gem	Dmitriy Zaporozhets	2015-03-09	2	-0/+3
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq	Dmitriy Zaporozhets	2015-05-13	1	-5/+0
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'code-defreeze' into 'master'	Marin Jankovski	2015-05-13	1	-5/+0
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	defreeze code Fixes #2166. See merge request !1820
\| \| * \| \| \| \| \|	defreeze code	Job van der Voort	2015-05-11	1	-5/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-05-13	7	-4/+57
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-05-12	7	-4/+57
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| / / / / / / \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'fix-avatar-removal' into 'master'	Hannes Rosenögger	2015-05-12	7	-4/+57
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where avatar filenames were not actually deleted from the database during removal This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570 See merge request !620
\| \| * \| \| \| \|	Fix bug where avatar filenames were not actually deleted from the database ↵	Stan Hu	2015-05-07	7	-5/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	during removal. This would result in a 404 error in certain views. The `save` call was being rolled back due to an error in the validation step. Relax the validation step so that this works. Closes #1570
* \| \| \| \| \| \|	Merge branch 'remove-outdated-gif' into 'master'	Sytse Sijbrandij	2015-05-12	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace outdated gif in README with link to website Fixes #2298 See merge request !1806
\| * \| \| \| \| \|	Replace outdated gif in README with link to website	Dmitriy Zaporozhets	2015-05-06	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'ad-block_auto_created_users' into 'master'	Dmitriy Zaporozhets	2015-05-12	3	-5/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't accidentally unblock auto created users from Active Directory. Fixes #1581. See merge request !638
\| * \| \| \| \| \| \|	Don't accidentally unblock auto created users from Active Directory.ad-block_auto_created_users	Douwe Maan	2015-05-12	3	-5/+25
\| \| \| \| \| \| \| \|