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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	Move repository when project is removed	Dmitriy Zaporozhets	2015-06-03	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ths commit does next: * When we remove project we move repository to path+deleted.git * Then we schedule removal of path+deleted with sidekiq * If repository move failed we abort project removal This should help us with NFS issue when project get removed but repository stayed. The full explanation of problem is below: * rm -rf project.git * rm -rf removes project.git/objects/foo * NFS server renames foo to foo.nfsXXXX because some NFS client (think * Unicorn) still has the file open * rm -rf exits, but project.git/objects/foo.nfsXXX still exists * Unicorn closes the file, the NFS client closes the file (foo), and the * NFS server removes foo.nfsXXX * the directory project.git/objects/ still exists => problem So now we move repository and even if repository removal failed Repository directory is moved so no bugs with project removed but repository directory taken. User still able to create new project with same name. From administrator perspective you can easily find stalled repositories by searching `*+deleted.git` Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge branch 'ignore-references' into 'master'	Dmitriy Zaporozhets	2015-06-02	3	-39/+31
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
\| * \| \| \| \| \| \|	Fix typo.	Douwe Maan	2015-06-02	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Ignore references in blockquotes.	Douwe Maan	2015-06-02	2	-5/+12
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Actually ignore references in code blocks etc.	Douwe Maan	2015-06-02	2	-34/+19
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Further limit the limited whitelist for project/group descriptionsrs-more-nofollow	Robert Speicher	2015-06-02	1	-0/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add a `pipeline` context option for SanitizationFilter	Robert Speicher	2015-06-02	2	-21/+40
\| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When this option is `:description`, we use a more restrictive whitelist. This is used for Project and Group description fields.
* \| \| \| \| \| \|	Merge pull request #8730 from drunkard/master	Marin Jankovski	2015-06-02	2	-1/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Specify shell while run me as git user
\| * \| \| \| \| \|	Improve comments for shell_path	Drunkard Zhang	2015-05-04	1	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Specify shell while run me as git user	Drunkard Zhang	2015-02-04	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some users disabled "git" user's shell after finished installation, this will lead to "This account is currently not available" and could not run /etc/init.d/gitlab, this dirty trick fix it. Signed-off-by: Drunkard Zhang <gongfan193@gmail.com>
* \| \| \| \| \| \|	Remove unnecessary satellite files and add CHANGELOG item	Dmitriy Zaporozhets	2015-06-02	2	-67/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Remove now unnecessary satelittes logic for creating and editing file with ↵web-editor-rugged	Dmitriy Zaporozhets	2015-06-02	3	-143/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	web editor Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Disable changing of the source branch in merge request update API	Stan Hu	2015-05-29	1	-2/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Update jasmine:ci task to use teaspoon	Robert Speicher	2015-05-28	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'user-destroy-wo-groups' into 'master'	Dmitriy Zaporozhets	2015-05-28	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	You can not remove user if he/she is an only owner of group To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !730
\| * \| \| \| \| \|	You can not remove user if he/she is an only owner of group	Dmitriy Zaporozhets	2015-05-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Add ExternalLinkFilter to Markdown pipeliners-dont-follow-me	Robert Speicher	2015-05-27	2	-0/+35
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Forces a `rel="nofollow"` attribute on all external links.
* \| \| \| \| \|	Make use of to_reference in more specs	Robert Speicher	2015-05-26	6	-8/+11
\| \| \| \| \| \|
* \| \| \| \| \|	Support only double quotes for multi-word label references	Robert Speicher	2015-05-26	1	-2/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Add `reference_pattern` to Referable models	Robert Speicher	2015-05-26	9	-65/+16
\| \| \| \| \| \|
* \| \| \| \| \|	Correct the ReferenceFilter html/pipeline/filter require	Robert Speicher	2015-05-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'rs-issue-1690' into 'master'	Dmitriy Zaporozhets	2015-05-26	1	-3/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Better handle label references that aren't actually references Fixes #1690 See merge request !705
\| * \| \| \| \| \|	Better handle label references that aren't actually referencesrs-issue-1690	Robert Speicher	2015-05-25	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1690
* \| \| \| \| \| \|	Merge branch 'get-monkey-off-my-rack-attack' into 'master'	Douwe Maan	2015-05-26	2	-32/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Rack Attack monkey patches and bump to version 4.3.0 I finally got these monkey patches into Rack Attack v4.3.0, so GitLab no longer needs them. Hooray! See: https://github.com/kickstarter/rack-attack/pull/128 See merge request !693
\| * \| \| \| \| \|	Remove Rack Attack monkey patches and bump to version 4.3.0	Stan Hu	2015-05-22	2	-32/+0
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Add support for Webhook note events	Stan Hu	2015-05-21	1	-2/+4
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/6745
* \| \| \| \|	Customize the sanitization whitelist only oncers-issue-1651	Robert Speicher	2015-05-20	1	-13/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1651
* \| \| \| \|	Subclass TaskList::Filter to fix a bugrs-issue-1645	Robert Speicher	2015-05-20	2	-2/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of using a fork, we subclass the filter and only apply the `task-list` class to list items that actually are task lists. Closes #1645 See https://github.com/github/task_list/pull/60
* \| \| \| \|	Merge branch 'shell-secret-path' of https://github.com/jirutka/gitlabhq into ↵	Marin Jankovski	2015-05-19	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jirutka-shell-secret-path
\| * \| \| \| \|	Allow to configure gitlab_shell_secret location	Jakub Jirutka	2015-05-16	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Simplify and unify helpers for rendering markup	Jakub Jirutka	2015-05-18	1	-3/+5
\| \| \| \| \| \|
* \| \| \| \| \|	Rename MarkdownHelper to MarkupHelper	Jakub Jirutka	2015-05-18	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Handle AsciiDoc better, reuse HTML pipeline filters (fixes #9263)	Jakub Jirutka	2015-05-18	2	-1/+70
\| \| \| \| \| \|
* \| \| \| \| \|	Add search issues/MR by number	Nikita Verkhovin	2015-05-18	1	-2/+14
\|/ / / / /
* \| \| \| \|	Ensure that the first added admin performs repository imports	Fotis Gimian	2015-05-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'dashboard-references' into 'master'	Dmitriy Zaporozhets	2015-05-15	2	-8/+13
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix reference links in dashboard activity and ATOM feeds. References like `@user` were not linked on the dashboard activity feed and in Atom feeds, because the reference parser depends on `@project` which isn't set in those situations. This MR passes the project in question to the reference parsers in an option. cc @rspeicher See merge request !653
\| * \| \| \| \|	Fix reference links in dashboard activity and ATOM feeds.dashboard-references	Douwe Maan	2015-05-14	2	-8/+13
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'project_api_order' into 'master'	Dmitriy Zaporozhets	2015-05-14	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add order option for projects API https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !656
\| * \| \| \| \| \|	Add order option for projects API	Valery Sizov	2015-05-14	1	-1/+6
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'rs-relative-link-filter' into 'master'	Dmitriy Zaporozhets	2015-05-14	2	-17/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor RelativeLinkFilter cleanup See merge request !649
\| * \| \| \| \| \|	Minor RelativeLinkFilter cleanuprs-relative-link-filter	Robert Speicher	2015-05-13	2	-17/+31
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'omniauth-csrf' into 'master'	Dmitriy Zaporozhets	2015-05-14	1	-0/+66
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Protect OmniAuth request phase against CSRF. Addresses #2268. See merge request !1793
\| * \| \| \| \| \|	Add reset_session for the :reset_session strategy.	Douwe Maan	2015-04-24	1	-1/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Protect OmniAuth request phase against CSRF.	Douwe Maan	2015-04-24	1	-0/+62
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use SIGKILL by default in Sidekiq::MemoryKiller	Jacob Vosmaer	2015-05-13	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \|	Merge branch 'text-batch-1' into 'master'	Dmitriy Zaporozhets	2015-05-13	5	-50/+50
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve OAuth signup error message.	Douwe Maan	2015-05-13	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	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
\| \| \| \| \| \| \|