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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix/routing' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce	Dmitriy Zaporozhets	2014-01-27	4	-12/+1
\|\
\| *	Add files to path blacklist.	Jason Hollingsworth	2014-01-24	4	-12/+1
\| \| \| \| \| \| \| \|	Remove empty ErrorsController
* \|	Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce	Dmitriy Zaporozhets	2014-01-27	3	-9/+5
\|\ \
\| * \|	Fix broken test in spec/models/project_spec.rb	Jason Hollingsworth	2014-01-24	3	-9/+5
\| \|/ \| \| \| \| \| \| \| \| \| \|	A test was broken if running on a non-standard port. Made checking for (non-)standard port more robust. Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2014-01-27	2	-2/+2
\|\ \
\| * \	Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce	Sytse Sijbrandij	2014-01-26	1	-1/+1
\| \|\ \
\| \| * \|	Removed hash from "<user> #pushed to branch..." Hipchat notification	Jeppe Toustrup	2014-01-14	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of /mnt/ebs/repositories/sriharsha.vardhan/gitlab-ce	Sytse Sijbrandij	2014-01-26	1	-1/+1
\| \|\ \ \
\| \| * \| \|	Correct section number for 'Check application status'	harsha	2014-01-22	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6158 from Razer6/remove_snippet_expiaration_date	Dmitriy Zaporozhets	2014-01-26	1	-7/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove snippet expiration date from UI
\| * \| \| \| \|	Remove snippet expiration date from UI	Robert Schilling	2014-01-25	1	-7/+0
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #6159 from dblessing/fix/mobile_ui_dashboard	Dmitriy Zaporozhets	2014-01-26	19	-17/+124
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Mobile UI improvements
\| * \| \| \| \|	Mobile UI improvements for dashboard/nav	Drew Blessing	2014-01-25	19	-17/+124
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Style navbar toggle button Style navbar toggle manually instead of with button classes Style navbar Modify color Turn off all tooltips for touch devices Style main nav Fix scrolling navbar collapse Style tweaks Minor tweaks Style no ssh key message
* \| \| \| \| \|	Merge pull request #5476 from lyda/logo-white-compress	Dmitriy Zaporozhets	2014-01-26	31	-0/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce image size.
\| * \| \| \| \| \|	Also optimise gifs with gifsicle.	Kevin Lyda	2014-01-05	7	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These are the same gif files just after running gifsicle -b --optimize */.gif
\| * \| \| \| \| \|	Another optipng run over png's.	Kevin Lyda	2014-01-05	14	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ran optipng -o7 -fix over all png files. This should make pages load a tiny bit faster (you can test this with the pagespeed tool on firefox or chrome). It might be an idea to add lossless image compression optimization runs to the release process.
\| * \| \| \| \| \|	Merge branch 'master' into logo-white-compress	Kevin Lyda	2014-01-05	578	-4529/+10385
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/assets/images/logo-black.png app/assets/images/logo-white.png
\| * \| \| \| \| \| \|	Reduce image size.	Kevin Lyda	2013-10-29	12	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Checking the site with the PageSpeed extension, one of the reports was in reducing image size. This reduced the number of bytes by 67%. It was done with optipng -o7 -fix *.png in the app/assets/images dir. References: optipng: http://optipng.sourceforge.net/ PageSpeed extension: https://developers.google.com/speed/docs/insights/using_chrome
* \| \| \| \| \| \| \|	Merge pull request #6163 from Corobi/master	Sytse Sijbrandij	2014-01-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	improve upgrader "latest version" message
\| * \| \| \| \| \| \|	improve upgrader "latest version" message	Corobi	2014-01-25	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #5907 from boomshadow/patch-1	Sytse Sijbrandij	2014-01-25	1	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	Update installation.md with new git version
\| * \| \| \| \| \|	Update installation.md	boomshadow	2013-12-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated the version of Git used in the section for compiling Git from source. Also, changed the verbiage used in the section "Initialize Database and Activate Advanced Features". It previously said to type 'yes' to install the database.
* \| \| \| \| \| \|	Merge branch 'database-confusion' into 'master'	Dmitriy Zaporozhets	2014-01-25	2	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Database Confusion To prevent https://twitter.com/TechIsCool/status/426133762032676865
\| * \| \| \| \| \| \|	Include a note for people that think the headers are wrong.	dosire	2014-01-23	2	-4/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Version to 6.6.0.pre	Dmitriy Zaporozhets	2014-01-25	1	-1/+1
\| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'reference_relative_links' into 'master'	Dmitriy Zaporozhets	2014-01-24	7	-11/+82
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reference style links with relative links in markdown #996 ``` Adds relative links support to reference style links, eg: [GitLab API doc directory][GitLab API directory listing] [Maintenance][Maintenance rake task] \[GitLab API directory listing]: doc/api/ \[Maintenance rake task]: doc/raketasks/maintenance.md ```
\| * \ \ \ \ \ \	Merge branch 'master' into reference_relative_links	Marin Jankovski	2014-01-24	137	-569/+720
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: spec/models/project_spec.rb
\| * \| \| \| \| \| \| \|	Use the correct paths.	Marin Jankovski	2014-01-23	3	-3/+3
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update last sha of the commit in the test seed repository.	Marin Jankovski	2014-01-23	2	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Test if the views behave correctly with reference style relative links.	Marin Jankovski	2014-01-23	3	-0/+34
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Markdown helper spec for reference style relative links.	Marin Jankovski	2014-01-23	1	-0/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Display correct paths in markdown for reference style links.	Marin Jankovski	2014-01-22	1	-6/+25
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'improve/developer_permissions' into 'master'	Dmitriy Zaporozhets	2014-01-24	8	-2/+16
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Permissions: Developer can manage issue tracker now
\| * \| \| \| \| \| \| \| \|	Improve authorization for new/edit blob pages	Dmitriy Zaporozhets	2014-01-24	4	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Allow developers to mange issue tracker	Dmitriy Zaporozhets	2014-01-24	4	-1/+12
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge branch 'improve/mr_service' into 'master'	Dmitriy Zaporozhets	2014-01-24	6	-32/+93
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve merge request accepting logic Add locked state to merge request during `accept` action. Prevents mr being `triggered as merged` twice (hooks, emails etc) Fixes #998 #729
\| * \| \| \| \| \| \| \|	Fix mr update issue if merge_request_diff missing	Dmitriy Zaporozhets	2014-01-24	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \|	MergeRequests services	Dmitriy Zaporozhets	2014-01-24	6	-31/+90
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'report_backup_db_success' into 'master'	Dmitriy Zaporozhets	2014-01-24	1	-2/+16
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Report success/failure of DB backup commands
\| * \| \| \| \| \| \| \|	Report failure of DB backup commands	Jacob Vosmaer	2014-01-23	1	-2/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'development_seed_fix' into 'master'	Dmitriy Zaporozhets	2014-01-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Development Project Seed Data Fix After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail. @dzaporozhets Do we want to backport this to 6.5 too? /cc @jacobvosmaer @sytse
\| * \| \| \| \| \| \| \| \|	Replace context with service in development seed data.	Marin Jankovski	2014-01-23	1	-1/+1
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'ssh-docs' into 'master'	Dmitriy Zaporozhets	2014-01-24	1	-2/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ssh Docs
\| * \| \| \| \| \| \| \| \|	Split into one sentence per line for future edits.	dosire	2014-01-23	1	-3/+8
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Better ssh key docs.	dosire	2014-01-23	1	-2/+8
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'oudated-version-headers' into 'master'	Dmitriy Zaporozhets	2014-01-24	2	-2/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Oudated Version Headers If we don't update version numbers we should not include them since they are confusing.
\| * \| \| \| \| \| \| \| \|	Remove version since we don't keep it up to date.	dosire	2014-01-23	2	-2/+0
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'release-procedure' into 'master'	Dmitriy Zaporozhets	2014-01-24	1	-6/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release Procedure This should be in line with what is actually happening.
\| * \| \| \| \| \| \| \| \| \|	Do not branch from master until release is done.	dosire	2014-01-24	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'jira-integration' into 'master'	Dmitriy Zaporozhets	2014-01-24	2	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jira Integration