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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \|	Fix responding to commit notes	Douwe Maan	2015-08-19	1	-4/+14
\| \| \| \| \| \|
\| * \| \| \| \|	Send a rejection email when the incoming email couldn't be processed.	Douwe Maan	2015-08-19	5	-12/+85
\| \| \| \| \| \|
\| * \| \| \| \|	Update mail_room.	Douwe Maan	2015-08-19	2	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Turn reply-by-email attachments into uploads.	Douwe Maan	2015-08-19	2	-3/+36
\| \| \| \| \| \|
\| * \| \| \| \|	Add "Reply to this email directly" to notification footer.	Douwe Maan	2015-08-19	1	-1/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Include display name with reply to address.	Douwe Maan	2015-08-19	1	-2/+15
\| \| \| \| \| \|
\| * \| \| \| \|	Correctly set Message-ID for comment notifications.	Douwe Maan	2015-08-19	1	-11/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Make MR notification email subject more standard.	Douwe Maan	2015-08-19	1	-42/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Changes and stuff.	Douwe Maan	2015-08-18	9	-30/+320
\| \| \| \| \| \|
\| * \| \| \| \|	Update mail_room	Douwe Maan	2015-08-18	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Reply by email POC	Douwe Maan	2015-08-18	16	-21/+224
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-email-autocomplete' into 'master'	Douwe Maan	2015-08-21	9	-9/+41
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
\| * \| \| \| \| \|	List the current user first in issuable dropdowns	Stan Hu	2015-08-21	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix bug preventing invite by e-mail	Stan Hu	2015-08-21	9	-9/+41
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
* \| \| \| \| \|	Merge branch 'rs-dev-issue-2550' into 'master'	Douwe Maan	2015-08-21	2	-1/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing HTML entities from non-Rinku autolinks as well. Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2550 See merge request !1179
\| * \| \| \| \| \|	Remove trailing HTML entities from non-Rinku autolinks as well.rs-dev-issue-2550	Robert Speicher	2015-08-20	2	-1/+17
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix-mr-create-permissions' into 'master'	Robert Speicher	2015-08-21	1	-2/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check permissions on target project in merge request create service. See merge request !1183
\| * \| \| \| \| \| \|	Check permissions on target project in merge request create service.	Douwe Maan	2015-08-21	1	-2/+8
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'fix-fork-mr-labels' into 'master'	Robert Speicher	2015-08-21	2	-1/+2
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where non-project members of the target project could set labels on new merge requests. Fixes #2292. See merge request !1180
\| * \| \| \| \| \|	Fix bug where non-project members of the target project could set labels on ↵fix-fork-mr-labels	Douwe Maan	2015-08-20	2	-1/+2
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new merge requests.
* \| \| \| \| \|	Merge branch 'fix-backup-restore' into 'master'	Robert Speicher	2015-08-21	1	-2/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not delete the SQL dump too early The change in baa157926d432f404a41c31ad6514ff8d5366269 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 . See merge request !1182
\| * \| \| \| \| \|	Do not delete the SQL dump too early	Jacob Vosmaer	2015-08-21	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The change in baa157926d432f404a41c31ad6514ff8d5366269 broke backup restore fucnctionality. This would not lead to data loss, but it prevented the restore script from working. This bug exists only in 7.14.0 release candidate versions, not in 7.13. Reported in https://github.com/gitlabhq/gitlabhq/issues/9571 .
* \| \| \| \| \| \|	Merge branch 'commit-image-branch' into 'master'	Dmitriy Zaporozhets	2015-08-21	1	-4/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed JS issue with diff image loading Fixes #1323 Whilst I couldn't reproduce the error locally, I did manage to get the same JS error message that was in the live env. See merge request !463
\| * \| \| \| \| \| \|	Fixed JS issue with diff image loading	Phil Hughes	2015-03-26	1	-4/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-21	5	-3/+51
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'hide-recent-push' into 'master'	Dmitriy Zaporozhets	2015-08-21	3	-2/+43
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Only show recent push event if the branch still exists or a recent merge request has not been created Closes #2277 See merge request !1167
\| \| * \| \| \| \| \| \| \|	Only show recent push event if the branch still exists or a recent merge ↵	Stan Hu	2015-08-20	3	-2/+43
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	request has not been created Closes #2277
\| * \| \| \| \| \| \| \|	Merge branch 'comment-case-insensetive-search' into 'master'	Dmitriy Zaporozhets	2015-08-21	3	-1/+8
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Case-insensitive search for comments Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1174
\| \| * \| \| \| \| \| \|	Case-insensetive search for commentscomment-case-insensetive-search	Dmitriy Zaporozhets	2015-08-19	3	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \|	Merge pull request #9535 from bbodenmiller/patch-3	Jacob Vosmaer	2015-08-21	1	-0/+52
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	check upload dir permissions
\| * \| \| \| \| \| \| \|	check uploads dir	Ben Bodenmiller	2015-08-16	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Detect issues with uploads dir, e.g. permission and ownership issues with the users uploads dir. This helps troubleshoot and correct gitlab-org/omnibus-gitlab#311. Fixes gitlabhq#7500, gitlabhq#7052. Related to gitlabhq#6281.
* \| \| \| \| \| \| \| \|	Merge branch 'issue-2306-repo-size-display' into 'master'	Dmitriy Zaporozhets	2015-08-21	1	-1/+5
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add size information back to project summary screen. ![gitlab-with-size](https://gitlab.com/nneul/gitlab-ce/uploads/84d15169aa7ee4e966465a71ca383f24/gitlab-with-size.png) See merge request !1178
\| * \| \| \| \| \| \| \|	Add size information back to project summary screen.	Nathan Neulinger	2015-08-20	1	-1/+5
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'fix-blame-lines-grouping' into 'master'	Douwe Maan	2015-08-20	3	-19/+86
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix blame view line groupings Before: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b84f75183244e58683b9172c772591d6/image.png) After: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/12ef635deefd3616142e65f064252020/image.png) Closes #2305 See merge request !1176
\| * \| \| \| \| \| \|	Fix blame view line groupings	Stan Hu	2015-08-20	3	-19/+86
\| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2305
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-08-20	27	-135/+184
\|\ \ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'top-menu-improvements' into 'master'	Dmitriy Zaporozhets	2015-08-20	27	-135/+184
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Navigation improvements - [x] make explore area as part of dashboard - [x] move navigation links from top right corner to sidebar - [x] group navigation items on dashboard - [x] cleanup UI after such changes - [ ] fix tests cc @sytses @JobV See merge request !1177
\| \| * \| \| \| \| \|	Cleanup groups pages UI a bittop-menu-improvements	Dmitriy Zaporozhets	2015-08-20	3	-11/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Small ui improvements to snippet page	Dmitriy Zaporozhets	2015-08-20	1	-8/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Cleanup snippets index pages	Dmitriy Zaporozhets	2015-08-20	3	-25/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Fix test	Dmitriy Zaporozhets	2015-08-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Rebuild navigation for dashboard	Dmitriy Zaporozhets	2015-08-20	19	-97/+112
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* projects from explore page are available from dashboard * use dashboard sidebar for both logged in and not users * move explroe projects under projects tab * move explore groups under groups tab * move public snippets under snippets tab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	Refactor sidebar navigation for dashboard	Dmitriy Zaporozhets	2015-08-20	11	-15/+68
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \|	Merge pull request #9563 from Telekom-PD/feature/control-import-options	Dmitriy Zaporozhets	2015-08-20	19	-80/+267
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Feature/control import options
\| * \| \| \| \| \|	Import sources: changelog	Artem Sidorenko	2015-08-20	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Import sources: show only enabled sources	Artem Sidorenko	2015-08-20	9	-77/+166
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Import sources: settings in the admin interface	Artem Sidorenko	2015-08-20	9	-3/+100
\|/ / / / / /
* \| \| \| \| \|	Merge branch '2fa-message-improvement' into 'master'	Sytse Sijbrandij	2015-08-19	1	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved 2FA warning message about lost codes Fixes internal issue: https://dev.gitlab.org/gitlab/gitlabhq/issues/2472 The warning message now clearly states that access will be lost of the 2FA recovery codes are not saved. /cc @sytses @JobV See merge request !1175
\| * \| \| \| \| \|	Improved 2FA warning message about lost codes	Patricio Cano	2015-08-19	1	-1/+3
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #9551 from Telekom-PD/feature/search-for-archived-projects	Douwe Maan	2015-08-19	13	-7/+97
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	Feature/search for archived projects