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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Douwe Maan	2015-09-28	22	-119/+444
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'projects'	Dmitriy Zaporozhets	2015-09-28	22	-119/+444
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| / / / \| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \|	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
\| \| * \| \| \| \| \|	Fix tests	Dmitriy Zaporozhets	2015-09-25	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \| \| \| \|	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	6	-0/+46
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add entry to changelog	Pavel Forkert	2015-09-24	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Clarify spec title explanation	Pavel Forkert	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	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	5	-21/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add option to admin area to sign in as a specific user	Pavel Forkert	2015-09-24	5	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2291
* \| \| \| \| \| \| \|	Merge branch 'add-activity-dashboard-preference' into 'master'	Dmitriy Zaporozhets	2015-09-28	6	-5/+38
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	6	-5/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	default dashboard Closes #2662
* \| \| \| \| \| \| \| \|	Merge pull request #9669 from aaronsnyder/admin-labels-grammar	Stan Hu	2015-09-26	3	-3/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar in admin area labels when no labels exist
\| * \| \| \| \| \| \| \| \|	Fix grammar in admin area labels .nothing-here-block when no labels exist.	Aaron Snyder	2015-09-26	3	-3/+4
\| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updating admin area > "Labels" text to "There are no labels yet.", per Stan Hus suggestion.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-1' into 'master'	Stan Hu	2015-09-26	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed grammar on Using Docker Build doc. See merge request !1448
\| * \| \| \| \| \| \| \|	Simplified sentence as per @stanhu's note	Cyriac Thomas	2015-09-26	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixed grammar on Using Docker Build doc.	Cyriac Thomas	2015-09-26	1	-3/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/gitlabhq/gitlabhq	Stan Hu	2015-09-25	1	-1/+1
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge pull request #9650 from szechyjs/fb-close-comment	Stan Hu	2015-09-25	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	FogBugz Import: Include closed comments since they may contain user data
\| \| * \| \| \| \| \| \|	FogBugz Import: Closed comments may contain user data	Jared Szechy	2015-09-21	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'rs-correct-markdown-doc' into 'master'	Robert Speicher	2015-09-25	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct an inaccuracy in the Markdown doc [ci skip] See merge request !1445
\| * \| \| \| \| \| \| \| \|	Correct an inaccuracy in the Markdown doc	Robert Speicher	2015-09-25	1	-2/+2
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'rs-changelog' into 'master'	Robert Speicher	2015-09-25	2	-299/+4
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add unreleased 8.0.3 entry to CHANGELOG [ci skip] See merge request !1440
\| * \| \| \| \| \| \| \|	Remove CHANGELOG-CI	Robert Speicher	2015-09-25	1	-298/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \|	Add unreleased 8.0.3 entry to CHANGELOG	Robert Speicher	2015-09-25	1	-1/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'	Dmitriy Zaporozhets	2015-09-25	2	-2/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix Error 500 in creating merge requests with > 1000 diffs	Stan Hu	2015-09-25	2	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #2692
* \| \| \| \| \| \| \| \|	Merge branch 'fix-stuck-forked-project-import' into 'master'	Dmitriy Zaporozhets	2015-09-25	4	-2/+13
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-5/+13
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix bug where projects would appear to be stuck in the forked import state	Stan Hu	2015-09-25	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'unicorn-listen-8080' into 'master'	Marin Jankovski	2015-09-25	1	-0/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure Unicorn listens on localhost:8080 Some installations from source run into this when upgrading to 8.0. See merge request !1435
\| * \| \| \| \| \| \| \| \|	Make sure Unicorn listens on localhost:8080unicorn-listen-8080	Jacob Vosmaer	2015-09-25	1	-0/+13
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	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 'hook-api-updates' into 'master'	Stan Hu	2015-09-24	5	-4/+38
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hook api updates See merge request !1429
\| * \| \| \| \| \| \| \| \|	hooks: improve tests for hook API	Ben Boeckel	2015-09-24	2	-1/+27
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	api: add enable_ssl_verification to PUT/POST hooks	Ben Boeckel	2015-09-24	2	-2/+6
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	doc: list note_events as a valid parameter for PUT/POST hooks	Ben Boeckel	2015-09-24	1	-0/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	api: expose note_events and enable_ssl_verification for hooks	Ben Boeckel	2015-09-24	2	-1/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'get-ci-token-from-ci-projects' into 'master'	Robert Speicher	2015-09-24	4	-5/+12
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Get CI token from ci projects This fixes problem when GitLabCiService had different token than stored in Ci::Project. See merge request !1425
\| * \| \| \| \| \| \| \| \| \|	Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projects	Kamil Trzcinski	2015-09-24	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update stub syntax	Robert Speicher	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix grack auth spec	Kamil Trzcinski	2015-09-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix specs	Kamil Trzcinski	2015-09-24	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #9664 from fantasywind/patch-1	Robert Schilling	2015-09-24	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Update 7.14-to-8.0.md