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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	Improve css for file actions	Dmitriy Zaporozhets	2015-03-13	8	-36/+43
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Update changelog with change to unicorn workers number recommendation.	Marin Jankovski	2015-03-13	1	-4/+5
\| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Marin Jankovski	2015-03-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge pull request #8954 from pupaxxo/patch-2	Robert Schilling	2015-03-13	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in CHANGELOG.md
\| \| * \| \| \| \| \| \| \| \|	Fix typo in CHANGELOG.md	Andrea Ruggiero	2015-03-13	1	-1/+1
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-03-13	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'fix_tests' into 'master'	Douwe Maan	2015-03-13	2	-1/+3
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing tests Revert the last merge, as it breaks the master and I didn't see that this line is used in hooks as well when I merged this. See merge request !390
\| \| * \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'follow-on-mr376' into 'master'"	Hannes Rosenögger	2015-03-13	2	-1/+3
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 07f9a3f928d39accf876d052b265844f74130099, reversing changes made to 4803675190833cdf7e83558a32b2f2ea3283dce0. Reverted this because the data is used in hooks as well.
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'follow-on-mr376' into 'master'	Hannes Rosenögger	2015-03-13	2	-3/+1
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Follow on to MR 376 Follow-on to MR 376 from @haynes . Remove unnecessary fetch of commit messages for initial push. This will reduce the memory usage significantly. See merge request !387
\| \| * \| \| \| \| \| \| \| \|	Remove unnecessary fetch of commit messages for initial push. This will ↵	Elliot	2015-03-13	2	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reduce the memory usage significantly.
* \| \| \| \| \| \| \| \| \| \|	Change default number of unicorn workers to three.	Marin Jankovski	2015-03-13	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'ldap-unblock-user' into 'master'	Dmitriy Zaporozhets	2015-03-13	3	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unblock user if they were unblocked in AD. Fixes problem with !1687. See merge request !1694
\| * \| \| \| \| \| \| \| \| \|	Unblock user if they were unblocked in AD.	Douwe Maan	2015-03-13	3	-2/+12
\| \| \|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'bump-gitlab-git' into 'master'	Dmitriy Zaporozhets	2015-03-13	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump gitlab_git to 7.1.1 Verify found object is actually a commit in Commit.find. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1204 See merge request !1696
\| * \| \| \| \| \| \| \| \| \|	Bump gitlab_git to 7.1.1	Dmitriy Zaporozhets	2015-03-13	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Verify found object is actually a commit in Commit.find
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-encoding' into 'master'	Dmitriy Zaporozhets	2015-03-13	4	-7/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor cleanup around UTF-8 encoding. Minor cleanup to be merged after https://dev.gitlab.org/gitlab/gitlab_git/merge_requests/24 is merged in. See merge request !1642
\| * \| \| \| \| \| \| \| \| \|	Reuse blob object fetched by Gitlab::Git::Blame.	Douwe Maan	2015-03-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Everything from gitlab_git is already UTF-8.	Douwe Maan	2015-03-13	3	-5/+5
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'tag-branch-hooks' into 'master'	Dmitriy Zaporozhets	2015-03-13	10	-45/+87
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute hooks and services when branch or tag is created or deleted through web interface. Fixes #2095. Split up into commits to make it easier to see why what was changed :) See merge request !1692
\| * \| \| \| \| \| \| \| \| \|	Add changelog item.	Douwe Maan	2015-03-13	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Move tag deletion to service and execute hooks and services.	Douwe Maan	2015-03-13	2	-6/+47
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Ecevute hooks and services when branches are created/deleted through web.	Douwe Maan	2015-03-13	2	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	More consistent method naming.	Douwe Maan	2015-03-13	2	-5/+8
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Use PushDataBuilder where applicable.	Douwe Maan	2015-03-13	4	-27/+22
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Set push data object kind in PushDataBuilder.	Douwe Maan	2015-03-13	3	-7/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'ldap-form' into 'master'	Dmitriy Zaporozhets	2015-03-13	3	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use custom LDAP label in LDAP signin form. Addresses https://dev.gitlab.org/gitlab/gitlab-ee/issues/238 ![Screen_Shot_2015-03-13_at_15.43.19](https://dev.gitlab.org/gitlab/gitlabhq/uploads/e9f0d1ed7238701ecdbaa54d4f538d89/Screen_Shot_2015-03-13_at_15.43.19.png) See merge request !1693
\| * \| \| \| \| \| \| \| \| \|	Use custom LDAP label in LDAP signin form.	Douwe Maan	2015-03-13	3	-4/+5
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'import-options-dup' into 'master'	Dmitriy Zaporozhets	2015-03-13	4	-3/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import pages not working after first load. Fixes #2102. `OAuth2::Client` was deleting keys from the options hash in place, which made it incomplete the next time the import page was loaded. We dup it so this no longer happens. See merge request !1691
\| * \| \| \| \| \| \| \| \| \|	Fix import pages not working after first load.	Douwe Maan	2015-03-13	4	-3/+4
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-webhooks-docs' into 'master'	Robert Schilling	2015-03-13	2	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Webhook documentation for tag and tag push events Just a quick update to include the `object_kind` field in the Webhooks documentation. See merge request !389
\| * \| \| \| \| \| \| \| \| \|	Update documentation for object_kind field in Webhook push and tag push Webhooks	Stan Hu	2015-03-13	2	-0/+3
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'enhance_markdown_linebreak_docs' into 'master'	Hannes Rosenögger	2015-03-13	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhance Markdown linebreak docs The "Line Breaks" section within the Markdown docs was missing an example of creating a line break within a paragraph by ending a line with two spaces. See merge request !335
\| * \| \| \| \| \| \| \| \|	Add an example of creating a line break by adding two spaces at	Ewan Edwards	2015-02-11	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the end of a line.
* \| \| \| \| \| \| \| \| \|	Merge branch 'irker-service-use-supported-events' into 'master'	Drew Blessing	2015-03-13	1	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Irker service check supported_events 63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42 added the supported_events check for services. Since f84b7eef3f969a65d0930c9d62b6968b2ae70f12 was just added, we should adjust it accordingly. See merge request !367
\| * \| \| \| \| \| \| \| \| \|	Make Irker service use the supported events check	Stan Hu	2015-03-04	1	-2/+8
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'mr-filter-by-title' into 'master'	Dmitriy Zaporozhets	2015-03-13	11	-35/+90
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Implement merge requests search It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues See merge request !1690
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into mr-filter-by-title	Dmitriy Zaporozhets	2015-03-12	34	-64/+95
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/controllers/projects/merge_requests_controller.rb
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'default-pagination' into 'master'	Dmitriy Zaporozhets	2015-03-12	19	-27/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use same constant for amount of items per page See merge request !1689
\| * \| \| \| \| \| \| \| \| \| \| \|	Use same constant for amount of items per page	Dmitriy Zaporozhets	2015-03-12	19	-27/+29
\| \| \|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'group-icon-performance' into 'master'	Dmitriy Zaporozhets	2015-03-12	10	-33/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent database query each time we render group avatar Fixes #2118 See merge request !1688
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix specs	Dmitriy Zaporozhets	2015-03-12	2	-18/+21
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Prevent database query each time we render group avatar	Dmitriy Zaporozhets	2015-03-12	8	-15/+18
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'replace_passwords_with_asterisk' into 'master'	Marin Jankovski	2015-03-12	2	-2/+12
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show asterisks instead of password in service edit form. See merge request !1686
\| * \| \| \| \| \| \| \| \| \| \| \|	Show asterisks instead of password in service edit form.	Marin Jankovski	2015-03-12	2	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'ldap-block-user' into 'master'	Dmitriy Zaporozhets	2015-03-12	3	-2/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Block user if he/she was blocked in Active Directory For gitlab/gitlab-ee#248 See merge request !1687
\| * \| \| \| \| \| \| \| \| \| \| \|	Block user if he/she was blocked in Active Directory	Dmitriy Zaporozhets	2015-03-12	3	-2/+15
\|/ / / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Implement merge requests search	Dmitriy Zaporozhets	2015-03-12	11	-35/+90
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It is same search like we have at issues page. It allows to quickly filter merge requests based on title or desription. I copy-pasted some js code from Issues.js. In future search (filtering) logic should be refactoed into one class for merge requests and issues
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-12	6	-6/+108
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'fix_email_images' into 'master'	Douwe Maan	2015-03-12	6	-6/+108
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email images ## Dependencies: This MR Depends on gitlab-org/html-pipeline-gitlab!4 being merged and published to rubygems.org ## What does this MR do? This MR fixes the broken images in emails that occured scince we introduced access control for all attachments in 7.8. The access control lead to broken images, because the user usually isn't logged into gitlab when opening the email in his mail client. The solution to fix this, is to replace all images that were uploaded to gitlab as attachemnts with inline images in emails. I only added one test for images in notes, because all notes share the same view. If it works fine for a note on a commit, then it'll also work the same for notes on a MR or on issues. @DouweM can you review this please? Closes #1161 See merge request !373
\| \| * \| \| \| \| \| \| \| \| \|	replace images in emails with inline images	Hannes Rosenögger	2015-03-12	6	-6/+108
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced