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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Make sure important directories exist in git	Robert Speicher	2014-03-30	3	-0/+0
\| \| \| \| \| \| \|	Ensures the following directories exist after a git clone: - public/uploads - tmp/pids - tmp/sockets
*	Merge branch 'refactor_project_watchers_notifications' into 'master'	Dmitriy Zaporozhets	2014-03-29	1	-13/+33
\|\ \| \| \| \| \| \|	Refactor project watchers notifications
\| *	Refactor project watchers collecting.	Marin Jankovski	2014-03-28	1	-13/+33
\| \|
* \|	Merge pull request #6317 from jirutka/fix-ldap-dn-case	Dmitriy Zaporozhets	2014-03-29	1	-1/+6
\|\ \ \| \| \| \| \| \|	Fix searching by extern_uid for LDAP to be case-insensitive
\| * \|	Fix searching by extern_uid for LDAP to be case-insensitive	Jakub Jirutka	2014-02-18	1	-1/+6
\| \| \|
* \| \|	Merge pull request #6644 from tombruijn/list-item-name-spacing	Dmitriy Zaporozhets	2014-03-28	10	-28/+48
\|\ \ \ \| \| \| \| \| \| \| \|	.well-list item name spacing fix Follow up on #6643
\| * \| \|	Improve alignment of labels in .well-list items	Tom de Bruijn	2014-03-28	9	-27/+42
\| \| \| \|
\| * \| \|	Clearfix on well-lists. Pages affected:	Tom de Bruijn	2014-03-28	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pages affected: - admin/groups#show - admin/projets#index - admin/users#index - dashboard/issues#index (on small screens)
* \| \| \|	Merge remote-tracking branch 'origin/rake_drop_tables'	Dmitriy Zaporozhets	2014-03-28	3	-2/+14
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Conflicts: CHANGELOG
\| * \| \|	Drop all tables before restoring a PostgreSQL DB	Jacob Vosmaer	2014-03-28	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Invoking 'db:schema:load' turned out to be a bad idea: when downgrading an existing GitLab installation, the schema of the newer version would be preserved when trying to import the old version.
\| * \| \|	Add a rake task that drops all tables	Jacob Vosmaer	2014-03-28	1	-0/+10
\| \|/ /
* \| \|	Merge branch 'ldap_nickname' into 'master'	Dmitriy Zaporozhets	2014-03-28	2	-5/+2
\|\ \ \ \| \|/ / \|/\| \| \| \| \|	Remove omniauth-ldap nickname bug workaround
\| * \|	Use omniauth nickname as the username for LDAP	Jacob Vosmaer	2014-03-28	2	-5/+2
\|/ / \| \| \| \| \| \| \| \| \| \|	Before there was a bug in omniauth-ldap which prevented samaccountname showing up as a possible username for new LDAP users. Thanks to upstream fixes, we no longer need to work around this bug.
* \|	Merge branch 'documentation/update_mr_contribution_section' into 'master'	Marin Jankovski	2014-03-28	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Contribution Guidelines: Specify Merge Request To Master There have been occasions where contributors submitted merge requests to stable branches thinking that was the way to get changes into specific releases. This results in wasted time and effort of the GitLab team responding to the merge request requesting that it be to master, as well as the developer who needs to redo the changes. This merge request very simply updates the contribution guidelines to specify that MRs should only be to master, and that getting changes into stable branches will be determined by the GitLab Team. cc @JobV
\| * \|	Updated contribution guidelines to specify MRs should be to master.	Kyle Fazzari	2014-03-27	1	-1/+1
\| \| \|
* \| \|	Merge pull request #6553 from tehZeno/patch-1	Marin Jankovski	2014-03-27	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Update 6.0-to-6.5.md
\| * \ \	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into patch-1	Franz-Robert van Vugt	2014-03-27	165	-882/+1699
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Merge branch 'getting-help-on-website' into 'master'	Dmitriy Zaporozhets	2014-03-27	1	-19/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Getting-help-on-website
\| * \| \| \|	Move help to the website.	dosire	2014-03-27	1	-19/+1
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge branch 'doc-readme-for-site' into 'master'	Dmitriy Zaporozhets	2014-03-27	9	-27/+66
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc-readme-for-site New readme files for doc.gitlab.com I also but the links for the api readme at the top.
\| * \| \| \|	New doc site needs indexes.	dosire	2014-03-27	8	-4/+37
\| \| \| \| \|
\| * \| \| \|	Test the new doc index.	dosire	2014-03-27	1	-0/+7
\| \| \| \| \|
\| * \| \| \|	Put important information at the top of the readme.	dosire	2014-03-27	1	-27/+26
\| \| \| \| \|
* \| \| \| \|	Merge pull request #6395 from dpursehouse/grammar-fixes	Dmitriy Zaporozhets	2014-03-27	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix another instance of "created at"
\| * \| \| \| \|	Fix another instance of "created at"	David Pursehouse	2014-02-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace it with "created on". Change-Id: Ibd26bf82d2e64f142a4f3be6da7701e5b035602f
* \| \| \| \| \|	Merge pull request #6491 from esmail/patch-1	Dmitriy Zaporozhets	2014-03-27	1	-0/+7
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Database doc changes to address #2412 and #6451.
\| * \| \| \| \| \|	Database doc changes to address #2412 and #6451.	esmail	2014-03-07	1	-0/+7
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission	Dmitriy Zaporozhets	2014-03-27	1	-1/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show merge status
\| * \| \| \| \| \| \|	Always show merge status	Jeroen van Baarsen	2014-03-27	1	-1/+4
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Always show the merge status of a merge request, even if the user has no permission to do the actual merging. Fixes http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2014-03-27	1	-2/+2
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'fix_architecture_img' into 'master'	Marin Jankovski	2014-03-27	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Architecture Img Image in architecture doc was not showing correctly. Now it is.
\| \| * \| \| \| \| \|	fix image not displaying in GitLab due to faulty markdown	Job van der Voort	2014-03-27	1	-2/+2
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge pull request #6632 from blackst0ne/patch-1	Sytse Sijbrandij	2014-03-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Update permissions.md
\| * \| \| \| \| \|	Update permissions.md	blackst0ne	2014-03-27	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bugfix/153/500_when_create_issue' into 'master'	Dmitriy Zaporozhets	2014-03-27	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 Error When Creating Issue For Project With No Commits This merge request fixes issue #153, where trying to create an issue for a project with no commits results in a 500 error. This was done by updating the form to check that the repository wasn't empty before trying to load the contribution guide.
\| * \| \| \| \| \|	Fixed 500 error when creating issue for project with no commits.	Kyle Fazzari	2014-03-27	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The form was updated to check that the repository wasn't empty before trying to load the contribution guide. This fixes #153.
* \| \| \| \| \|	Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2	Marin Jankovski	2014-03-27	4	-71/+147
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor Parallel Diff feature and add scrollbars
\| * \| \| \| \| \|	Refactor Parallel Diff feature and add scrollbars	George Dewar	2014-03-27	4	-71/+147
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also now removed lines relating to unused comments feature
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2014-03-27	1	-5/+5
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'bugfix/fix_unicorn-sidekiq_confusion_in_gitlab_init_script' ↵	Jacob Vosmaer	2014-03-26	1	-5/+5
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Fix Unicorn-Sidekiq Confusion In GitLab Init Script This merge request fixes issue #126 by updating a few sections of the included GitLab init file where Unicorn was referred to as Sidekiq and vice-versa.
\| \| * \| \| \| \| \|	Fixed Unicorn-Sidekiq confusion in GitLab init script.	Kyle Fazzari	2014-03-08	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There were a few places in the included init script where Unicorn was referred to as Sidekiq and vice-versa. This fixes #126.
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2014-03-27	1	-11/+11
\|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #6222 from nickryand/background_init	Jacob Vosmaer	2014-03-26	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the backgrounding of the unicorn_rails startup scripts
\| \| * \| \| \| \| \| \|	Removed the backgrounding of the unicorn_rails webapp start call.	Nick Downs	2014-03-25	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #5879 from krzaczek/smartos-fix	Jacob Vosmaer	2014-03-26	1	-10/+10
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|	Init script - change stop() function name to stop_gitlab()
\| \| * \| \| \| \| \| \|	Init script - change start() stop() restart() reload() to xxxx_gitlab()	Pawel Krzaczkowski	2014-03-26	1	-10/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ldap_check' into 'master'	Dmitriy Zaporozhets	2014-03-27	1	-1/+14
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab:ldap:check uses LDAP user filter
\| * \| \| \| \| \| \| \| \|	Ldap check recognize ldap user filter.	Marin Jankovski	2014-03-26	1	-1/+14
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'check-css' into 'master'	Dmitriy Zaporozhets	2014-03-26	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check Css Based on Dmitriy his remark https://gitlab.slack.com/archives/general/p1395770459000142
\| * \| \| \| \| \| \| \| \|	Nice trick for css class check mentioned by Dmitriy.	dosire	2014-03-25	1	-0/+1
\| \| \| \| \| \| \| \| \| \|