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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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 '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
\| \| \| \|
\| * \| \|	Get GitLabCiService token from CI project	Kamil Trzcinski	2015-09-24	1	-4/+7
\| \| \| \|
* \| \| \|	Fix default avatar not showing up in network graph	Stan Hu	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9657
* \| \| \|	Remove CI dashboard	Dmitriy Zaporozhets	2015-09-24	8	-86/+8
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	With CI status integrated at GitLab projects page there is no reason to keep it anymore. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Show CI status on Your projects page and Starred projects pageci-status-projects-page	Dmitriy Zaporozhets	2015-09-24	4	-5/+21
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \|	Merge branch 'fix-markdown-preview-font' into 'master'	Dmitriy Zaporozhets	2015-09-24	1	-1/+0
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use standard Markdown font in Markdown preview instead of fixed-width font Closes #2585 See merge request !1414
\| * \|	Use standard Markdown font in Markdown preview instead of fixed-width font	Stan Hu	2015-09-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #2585
* \| \|	Merge branch 'build-status-on-commit-page' into 'master'	Dmitriy Zaporozhets	2015-09-24	4	-34/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build status on commit page Screenshot: ![Screenshot_2015-09-24_11.29.54](https://gitlab.com/gitlab-org/gitlab-ce/uploads/49d1b9dc60d328dceaf771b5e44726ca/Screenshot_2015-09-24_11.29.54.png) Part of #2594 See merge request !1418
\| * \| \|	Show CI status on commit page	Dmitriy Zaporozhets	2015-09-24	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Refactor ci-status badge css	Dmitriy Zaporozhets	2015-09-24	2	-34/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch 'remove-routes-helper' into 'master'	Dmitriy Zaporozhets	2015-09-24	4	-37/+14
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Slack notification URL and remove the usage of Ci::RoutesHelper Fix for #2644 /cc @dzaporozhets @rspeicher See merge request !1391
\| * \| \|	Fix CI	Kamil Trzcinski	2015-09-22	1	-0/+2
\| \| \| \|
\| * \| \|	Fix Slack notification URL and remove the usage of Ci::RoutesHelper	Kamil Trzcinski	2015-09-22	4	-37/+12
\| \| \| \|
* \| \| \|	Merge branch 'move-ci-charts' into 'master'	Dmitriy Zaporozhets	2015-09-24	11	-55/+50
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move CI charts to project graphs area Part of #2594 Should be merged after !1405 Same page but moved to another place ![Screenshot_2015-09-23_16.25.15](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef7266de0528bd6dd3f95159e161ea9a/Screenshot_2015-09-23_16.25.15.png) See merge request !1407
\| * \| \| \|	Check for CI enabled in correct place	Dmitriy Zaporozhets	2015-09-24	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Add header for ci graphs and check that it is enabled	Dmitriy Zaporozhets	2015-09-24	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \|	Merge branch 'master' into move-ci-charts	Dmitriy Zaporozhets	2015-09-24	12	-79/+118
\| \|\ \ \ \
\| * \| \| \| \|	Move CI charts to project graphs area	Dmitriy Zaporozhets	2015-09-23	10	-55/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'rs-help-page' into 'master'	Douwe Maan	2015-09-24	2	-21/+11
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Help page improvements - Only signed-in users can see version information - Add "Community Edition" text so the header is less barren when version information is hidden - Minor copy edits - Make all "Quick help" link text the entire body of the link. Prior, it wasn't obvious which part of each item was an actual link. Closes #2721 See merge request !1415
\| * \| \| \| \| \|	Allow non-admin users to see version informationrs-help-page	Robert Speicher	2015-09-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We want users to know what features they have available (and to pressure their admins to upgrade).
\| * \| \| \| \| \|	Move the `version_check_enabled` check from view to helper	Robert Speicher	2015-09-23	2	-3/+2
\| \| \| \| \| \| \|