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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'move-ci-settings' into 'master'	Dmitriy Zaporozhets	2015-09-30	8	-53/+62
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI project settings page to CE project settings area Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1465
\| *	Move CI project settings page to CE project settings areamove-ci-settings	Dmitriy Zaporozhets	2015-09-29	8	-53/+62
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'fix-link-to-projects-path-from-dashboard' into 'master'	Dmitriy Zaporozhets	2015-09-29	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link directly to the projects page instead of the root controller If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. Fixes bug introduced by !1446. See merge request !1459
\| *	Link directly to the projects page instead of the root controller	Stan Hu	2015-09-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	If "Your Projects' Activity" dashboard setting were selected, it would be impossible to navigate to the projects page since the redirection would always bounce back to the activity dashboard. Fixes bug introduced by !1446.
* \|	Merge branch 'ci-commits-to-projects' into 'master'	Dmitriy Zaporozhets	2015-09-29	7	-34/+58
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make Ci::Commits belong to Project instead of Ci::Project See merge request !1455
\| * \|	Make ensure_gitlab_ci_project return ci_project or create a new oneci-commits-to-projects	Kamil Trzcinski	2015-09-29	2	-9/+3
\| \| \|
\| * \|	Rename commits to ci_commits	Kamil Trzcinski	2015-09-29	2	-4/+10
\| \| \|
\| * \|	Fix rubocop	Kamil Trzcinski	2015-09-29	1	-2/+2
\| \| \|
\| * \|	Fix tests	Kamil Trzcinski	2015-09-29	3	-5/+4
\| \| \|
\| * \|	Fix register_build_service tests	Kamil Trzcinski	2015-09-29	2	-3/+7
\| \| \|
\| * \|	Revert check_enable_flag! changes	Kamil Trzcinski	2015-09-29	1	-4/+4
\| \| \|
\| * \|	Fix tests	Kamil Trzcinski	2015-09-29	3	-11/+24
\| \| \|
\| * \|	WIP	Kamil Trzcinski	2015-09-29	5	-24/+27
\| \| \|
\| * \|	WIP	Kamil Trzcinski	2015-09-29	4	-6/+11
\| \| \|
* \| \|	Move CI triggers page to project settings areamove-triggers-page	Dmitriy Zaporozhets	2015-09-29	6	-54/+46
\|/ / \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Merge branch 'projects' into 'master'	Dmitriy Zaporozhets	2015-09-29	2	-1/+8
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	page-title-fix Fixed .page-title margin See merge request !1458
\| * \|	page-title-fix	Andrey	2015-09-28	2	-1/+8
\| \| \|
* \| \|	Merge branch 'move-variables-page' into 'master'	Dmitriy Zaporozhets	2015-09-29	7	-47/+39
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI variables page to project settings Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Part of #2594 See merge request !1457
\| * \| \|	Move CI variables page to project settingsmove-variables-page	Dmitriy Zaporozhets	2015-09-28	7	-47/+39
\| \| \|/ \| \|/\| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'krb_auth_helper_ce' into 'master'	Douwe Maan	2015-09-29	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove 'kerberos' from auth_helper.rb for gitlab-CE. There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510 (https://gitlab.com/gitlab-org/gitlab-ce/issues/2510). @DouweM suggested I send in this merge request. See merge request !1430
\| * \|	Remove 'kerberos' from auth_helper.rb for gitlab-CE.	Ben Rosser	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no Kerberos auth in gitlab-ce, so it shouldn't be noted as a form-driven auth mechanism in app/helpers/auth_helper.rb. This breaks using Kerberos as a custom omniauth provider. See issue #2510
* \| \|	Merge branch 'move-runners-page'	Dmitriy Zaporozhets	2015-09-28	16	-100/+107
\|\ \ \
\| * \| \|	Finish move of runners page to project settings	Dmitriy Zaporozhets	2015-09-28	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Move runners page to project settings	Dmitriy Zaporozhets	2015-09-25	13	-97/+104
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Fix admin runner page -> assign all button	Dmitriy Zaporozhets	2015-09-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'cyrillic-font' into 'master'	Dmitriy Zaporozhets	2015-09-28	4	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Source Sans Pro font: adds support for cyrillic characters Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes #2764 See merge request !1454
\| * \| \| \|	Update Source Sans Pro font: adds support for cyrillic characterscyrillic-font	Dmitriy Zaporozhets	2015-09-28	4	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Douwe Maan	2015-09-28	21	-117/+443
\|\ \ \ \ \
\| * \ \ \ \	Merge branch 'projects'	Dmitriy Zaporozhets	2015-09-28	21	-117/+443
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	!important removed from pre	Andrey	2015-09-28	3	-10/+5
\| \| \| \| \|
\| \| * \| \|	edit action allign	Andrey	2015-09-28	2	-6/+6
\| \| \| \| \|
\| \| * \| \|	Project page Update	Andrey	2015-09-25	12	-195/+263
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactoring buttons, fixes for projects filter on the dashboard and group page
\| \| * \| \|	UI changes to the project view, empty project and project list new project ↵	Andrey	2015-09-24	9	-69/+373
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	button
* \| \| \| \|	Merge branch 'fxposter/gitlab-ce-login-from-admin'	Douwe Maan	2015-09-28	2	-0/+8
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove stuff from previous UI	Pavel Forkert	2015-09-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Move login button to user page, switched to POST method	Pavel Forkert	2015-09-24	2	-1/+2
\| \| \| \| \|
\| * \| \| \|	Add option to admin area to sign in as a specific user	Pavel Forkert	2015-09-24	2	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2291
* \| \| \| \|	Merge branch 'add-activity-dashboard-preference' into 'master'	Dmitriy Zaporozhets	2015-09-28	3	-2/+8
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add user preference to view project activity and starred project activity as default dashboard Screenshot: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5e39fa66da50e01dd9ed1c8a9ce01ea9/image.png) Closes #2662 See merge request !1446
\| * \| \| \| \|	Add user preference to view project activity and starred project activity as ↵	Stan Hu	2015-09-26	3	-2/+8
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default dashboard Closes #2662
* \| \| \| \|	Fix grammar in admin area labels .nothing-here-block when no labels exist.	Aaron Snyder	2015-09-26	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
* \| \| \|	Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'	Dmitriy Zaporozhets	2015-09-25	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix Error 500 in creating merge requests with > 1000 diffs	Stan Hu	2015-09-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2692
* \| \| \| \|	Merge branch 'fix-stuck-forked-project-import' into 'master'	Dmitriy Zaporozhets	2015-09-25	1	-2/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where projects would appear to be stuck in the forked import state A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork were quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we can either delay the worker to ensure the DB has a chance to update, or use the nice `after_commit_queue` gem to schedule the task after the state machine commit. See: * https://github.com/pluginaweek/state_machine/issues/191 * https://github.com/shellycloud/after_commit_queue Closes #2736 See merge request !1434
\| * \| \| \|	Use after_commit_queue to schedule import job immediately	Stan Hu	2015-09-25	1	-5/+8
\| \| \| \| \|
\| * \| \| \|	Fix bug where projects would appear to be stuck in the forked import state	Stan Hu	2015-09-25	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A race condition existed between when Rails committed the `import_status` to `started` and when the Sidekiq worker forked a project. If this fork was quick, it's possible that the worker would attempt to move into the `finished` state before the `started` state took effect. As mentioned in https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting#cannot-find-modelname-with-id12345, we should delay the worker to ensure the DB has a chance to update. Closes #2736
* \| \| \| \|	Merge branch 'handle-bad-head' into 'master'	Dmitriy Zaporozhets	2015-09-25	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 occuring with repositories that have a bad HEAD A repository could have objects but no valid HEAD, causing `project.commit` to be `nil`. See merge request !1433
\| * \| \| \| \|	Fix Error 500 occuring with repositories that have a bad HEAD	Stan Hu	2015-09-24	1	-1/+1
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A repository could have objects but no valid HEAD, causing `project.commit` to be `nil`.
* \| \| \| \|	Merge branch 'get-ci-token-from-ci-projects' into 'master'	Robert Speicher	2015-09-24	2	-3/+7
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get CI token from ci projects This fixes problem when GitLabCiService had different token than stored in Ci::Project. See merge request !1425
\| * \| \| \|	Fix specs	Kamil Trzcinski	2015-09-24	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Remove unneeded change	Kamil Trzcinski	2015-09-24	1	-1/+2
\| \| \| \| \|